7 files changed, 24 insertions, 28 deletions
diff --git a/android/experimental/desktop/AndroidManifest.xml b/android/experimental/desktop/AndroidManifest.xml
index c5a6cc0927ac..9e3b4ac2b05f 100644
--- a/android/experimental/desktop/AndroidManifest.xml
+++ b/android/experimental/desktop/AndroidManifest.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.libreoffice.android.examples"
+      package="org.libreoffice.experimental.desktop"
       android:versionCode="1"
       android:versionName="1.0">
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="14"/>
-    <application android:label="LO Desktop App"
+    <application android:label="LibreOffice Desktop"
                  android:debuggable="true"
                  android:largeHeap="true"
                  android:hardwareAccelerated="true">
-        <activity android:name=".LODesktop"
-                  android:label="LO Desktop App"
+        <activity android:name=".Desktop"
+                  android:label="LibreOffice Desktop"
                   android:configChanges="keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index 5ea6f3591933..7069cb301876 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -4,7 +4,7 @@ include ../../../config_host.mk
 all: build-ant
 
 # The package of this app
-APP_PACKAGE=org.libreoffice.android.examples
+APP_PACKAGE=org.libreoffice.experimental.desktop
 
 BOOTSTRAPDIR=../../Bootstrap
 include $(BOOTSTRAPDIR)/Makefile.shared
@@ -18,12 +18,8 @@ copy-stuff:
 # Then "assets". Let the directory structure under assets mimic
 # that under solver for now.
 #
-# Please note that I have no idea what all of this is really necessary and for
-# much of this stuff being copied, no idea whether it makes any sense at all.
-# Much of this is copy-pasted from android/qa/sc/Makefile (where a couple of
-# unit tests for sc are built, and those do seem to mostly work) and
-# android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some
-# extent).
+# Please note that some of thses files being set up to be present in
+# the .apk and/or unpacked at install time might be unnecessary.
 #
 	mkdir -p assets/gz.unpack/program/ure assets/lib assets/program assets/xml/ure assets/ComponentTarget/i18npool/util
 	gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb
@@ -160,5 +156,4 @@ build-ant: android_version_setup copy-stuff link-so properties setup-jars
 	unset JAVA_HOME && $(ANT) debug
 
 run:
-	$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n org.libreoffice.android.examples/.LODesktop -e input /asset/test1.odt
-# -e lo-main-delay 20  -e lo-strace yes
-\ No newline at end of file
+	$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/.Desktop
diff --git a/android/experimental/desktop/build.xml b/android/experimental/desktop/build.xml
index 4aac2f548251..7f9cbeb76717 100644
--- a/android/experimental/desktop/build.xml
+++ b/android/experimental/desktop/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="LibreOfficeQA-SC" default="help">
+<project name="LibreOfficeExperimentalDesktop" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/android/experimental/desktop/fonts.conf b/android/experimental/desktop/fonts.conf
index 699e9d101048..e092541ef75b 100644
--- a/android/experimental/desktop/fonts.conf
+++ b/android/experimental/desktop/fonts.conf
@@ -74,7 +74,7 @@
 	     later to patch in proper code in fontonfig on Android to
 	     find out a good place.
 	-->
-	<cachedir>/data/data/org.libreoffice.android.examples/fontconfig</cachedir>
+	<cachedir>/data/data/org.libreoffice.experimental.desktop/fontconfig</cachedir>
 
 	<config>
 <!--
diff --git a/android/experimental/desktop/jni/Android.mk b/android/experimental/desktop/jni/Android.mk
index c5c2ed3b0293..9a30878a3f29 100644
--- a/android/experimental/desktop/jni/Android.mk
+++ b/android/experimental/desktop/jni/Android.mk
@@ -16,8 +16,4 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE    := dummy
-LOCAL_SRC_FILES := dummy.c
-LOCAL_LDLIBS    := 
-
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/experimental/desktop/native-code.cxx b/android/experimental/desktop/native-code.cxx
index 4f54ccd65c16..e6e4143b7b96 100644
--- a/android/experimental/desktop/native-code.cxx
+++ b/android/experimental/desktop/native-code.cxx
@@ -109,13 +109,13 @@ lo_get_libmap(void)
         { NULL, NULL }
     };
 
-    // We need to pull this in, too, as it isn't in any of the libs we
+    // We need to pull these in, too, as they aren't in any of the libs we
     // link with -Wl,--whole-archive.
-    extern void Java_org_libreoffice_android_examples_LODesktop_spawnMain();
-    volatile void *p = (void *) Java_org_libreoffice_android_examples_LODesktop_spawnMain;
+    extern void Java_org_libreoffice_experimental_desktop_Desktop_spawnMain();
+    volatile void *p = (void *) Java_org_libreoffice_experimental_desktop_Desktop_spawnMain;
 
-    extern void Java_org_libreoffice_android_examples_LODesktop_renderVCL();
-    volatile void *q = (void *) Java_org_libreoffice_android_examples_LODesktop_renderVCL;
+    extern void Java_org_libreoffice_experimental_desktop_Desktop_renderVCL();
+    p = (void *) Java_org_libreoffice_experimental_desktop_Desktop_renderVCL;
 
     return map;
 }
diff --git a/android/experimental/desktop/src/org/libreoffice/android/examples/LODesktop.java b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
index bf370e6e36cd..608752867932 100644
--- a/android/experimental/desktop/src/org/libreoffice/android/examples/LODesktop.java
+++ b/android/experimental/desktop/src/org/libreoffice/android/experimental/desktop/Desktop.java
@@ -9,6 +9,11 @@
 // This is just a testbed for ideas and implementations. (Still, it might turn
 // out to be somewhat useful as such while waiting for "real" apps.)
 
+// ================ NOTE ================
+// Note that these comments are copy-pasted from another test app,
+// DocumentLoader, and might or might not be much relevant for this
+// source file and how it will evolve.
+
 // Important points:
 
 // Everything that might take a long time should be done asynchronously:
@@ -54,7 +59,7 @@
 // has finished and then the affected tiles are replaced with
 // higher-resolution ones.
 
-package org.libreoffice.android.examples;
+package org.libreoffice.experimental.desktop;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -117,7 +122,7 @@ import java.util.ArrayList;
 
 import org.libreoffice.android.Bootstrap;
 
-public class LODesktop
+public class Desktop
     extends Activity
 {
     private static final String TAG = "LODesktop";
@@ -288,10 +293,10 @@ public class LODesktop
 
     class BitmapView extends android.view.View
     {
-        LODesktop mDesktop;
+        Desktop mDesktop;
         Bitmap mBitmap;
 
-        public BitmapView(Context context, LODesktop desktop)
+        public BitmapView(Context context, Desktop desktop)
         {
             super(context);
             mDesktop = desktop;