Fixed some erroneous package references.

7 files changed, 18 insertions, 21 deletions

diff --git a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index ec3855f012f5..daf42d9d489e 100644
--- a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -622,21 +622,6 @@ public class DocumentLoader
     {
         return gestureDetector.onTouchEvent(event);
     }
-    
-    @Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-	    switch (item.getItemId()) {
-	        case android.R.id.home:
-	            // app icon in action bar clicked; go home
-	            Intent intent = new Intent(this, LibreOfficeUIActivity.class);
-	            intent.putExtras( extras );
-	            //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-	            startActivity(intent);
-	            return true;
-	        default:
-	            return super.onOptionsItemSelected(item);
-	    }
-	}
 }
 
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/android/experimental/LibreOffice4Android/AndroidManifest.xml b/android/experimental/LibreOffice4Android/AndroidManifest.xml
index f521536fae0e..fcf62103d2b1 100644
--- a/android/experimental/LibreOffice4Android/AndroidManifest.xml
+++ b/android/experimental/LibreOffice4Android/AndroidManifest.xml
@@ -14,8 +14,8 @@
 		 android:theme="@android:style/Theme.Holo.Light">
 		 
         <!-- Original Document Loader activity - file Viewer -->         
-        <activity android:name=".android.examples.DocumentLoader"
-                  android:label="LO DocumentLoader"
+        <activity android:name=".android.DocumentLoader"
+                  android:label="DocumentLoader"
                   android:configChanges="orientation|keyboardHidden">
             <!-- <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index 94233369b0e2..d2c5f8e34cac 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -1,7 +1,7 @@
 include ../../../config_host.mk
 
 # The package of this app
-APP_PACKAGE=org.libreoffice.android.examples
+APP_PACKAGE=org.libreoffice
 
 # We can't keep assuming APP_DATA_PATH like this, surely this can vary with
 # Android versions and whatnot, this is temporary and works at least with the
diff --git a/android/experimental/LibreOffice4Android/fonts.conf b/android/experimental/LibreOffice4Android/fonts.conf
index 699e9d101048..263648a0aa87 100644
--- a/android/experimental/LibreOffice4Android/fonts.conf
+++ b/android/experimental/LibreOffice4Android/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/fontconfig</cachedir>
 
 	<config>
 <!--
diff --git a/android/experimental/LibreOffice4Android/res/values/styles.xml b/android/experimental/LibreOffice4Android/res/values/styles.xml
new file mode 100644
index 000000000000..5e74240f58c2
--- /dev/null
+++ b/android/experimental/LibreOffice4Android/res/values/styles.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="DocumentViewer" parent="@android:style/Theme.Holo">
+        <item name="android:windowActionBarOverlay">true</item>
+    	<item name="android:windowActionModeOverlay">true</item>
+    	<item name="android:actionBarStyle">@style/TransparentDarkActionBar</item>
+    </style>
+    <style name="TransparentDarkActionBar" parent="@android:style/Widget.Holo.ActionBar">
+        <item name="android:background">#dd000000</item>
+    </style>
+    
+</resources>
\ No newline at end of file
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
index cf042a426421..9fa07f8661f6 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/android/examples/DocumentLoader.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/android/DocumentLoader.java
@@ -27,7 +27,7 @@
 // the previous, and the next. This could be bumped higher, need to make the
 // "3" into a parameter below.
 
-package org.libreoffice.android.examples;
+package org.libreoffice.android;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index 0f31f199a088..420b48588a8c 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -1,7 +1,7 @@
 package org.libreoffice.ui;
 
 import org.libreoffice.R;
-import org.libreoffice.android.examples.DocumentLoader;
+import org.libreoffice.android.DocumentLoader;
 
 import java.io.File;
 import java.io.FileFilter;