android/experimental/LibreOffice4Android/AndroidManifest.xml | 2 +
android/experimental/LibreOffice4Android/Makefile | 2 -
android/experimental/LibreOffice4Android/build.xml | 13 +++++------
3 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit b18e6c7d2c35e781884c30af472143cd2fbc01a6
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Aug 3 12:08:46 2012 +0300
Reduce confusion, this isn't "DocumentLoader"
Change-Id: I69683f93894ea696c3aab4033aea0ab9624f6cff
diff --git a/android/experimental/LibreOffice4Android/build.xml
b/android/experimental/LibreOffice4Android/build.xml
index 5b9550c..9b4ac26 100644
--- a/android/experimental/LibreOffice4Android/build.xml
+++ b/android/experimental/LibreOffice4Android/build.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="LibreOfficeDocumentLoader" default="help">
+<project name="LibreOffice4Android" 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
commit 922c9d0edd2d716188442a96a5e42777b3481c82
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Aug 3 12:00:39 2012 +0300
Add the largeHeap and hardwareAccelerated attributes
Change-Id: Ie9f8e97314778f093dc7b4b3c133882fd06e894a
diff --git a/android/experimental/LibreOffice4Android/AndroidManifest.xml
b/android/experimental/LibreOffice4Android/AndroidManifest.xml
index 9386d8c..4991cae 100644
--- a/android/experimental/LibreOffice4Android/AndroidManifest.xml
+++ b/android/experimental/LibreOffice4Android/AndroidManifest.xml
@@ -9,6 +9,8 @@
<application
android:debuggable="true"
+ android:largeHeap="true"
+ android:hardwareAccelerated="true"
android:icon="@drawable/lo_icon"
android:label="@string/app_name"
android:theme="@android:style/Theme.Holo.Light">
commit 1e1b85848224ae90ecc874829a7446b8e7b4793c
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Aug 3 11:45:55 2012 +0300
Update for current SDK
Change-Id: I247075d5c8cef86a29a4c7fef03241396b2d76b7
diff --git a/android/experimental/LibreOffice4Android/build.xml
b/android/experimental/LibreOffice4Android/build.xml
index 5d96019..5b9550c 100644
--- a/android/experimental/LibreOffice4Android/build.xml
+++ b/android/experimental/LibreOffice4Android/build.xml
@@ -92,17 +92,18 @@
versioncode="${version.code}"
versionname="${version.name}"
debug="${build.is.packaging.debug}"
- manifest="AndroidManifest.xml"
+ manifest="${out.manifest.abs.file}"
assets="${asset.absolute.dir}"
- androidjar="${android.jar}"
+ androidjar="${project.target.android.jar}"
apkfolder="${out.absolute.dir}"
nocrunch="${build.packaging.nocrunch}"
resourcefilename="${resource.package.file.name}"
resourcefilter="${aapt.resource.filter}"
- projectLibrariesResName="project.libraries.res"
- projectLibrariesPackageName="project.libraries.package"
+ libraryResFolderPathRefid="project.library.res.folder.path"
+ libraryPackagesRefid="project.library.packages"
previousBuildType="${build.last.target}"
- buildType="${build.target}">
+ buildType="${build.target}"
+ ignoreAssets="${aapt.ignore.assets}">
<res path="${out.res.absolute.dir}" />
<res path="${resource.absolute.dir}" />
<nocompress /> <!-- forces no compression on any files in
assets or res/raw -->
commit f6dc6f14352c615fe45433cca5d1a00de97107ab
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Aug 3 11:45:32 2012 +0300
Start the LibreOfficeUIActivity with "make run"
Change-Id: I82aff7f40d8360c0306593b02200db205e52bbcc
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index bcf0d01..94cadc0 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -269,7 +269,7 @@ uninstall:
run:
# /data/local/tmp/sample-document.odt
- adb shell am start -n org.libreoffice.android.examples/.DocumentLoader
-e input /assets/test1.odt
+ adb shell am start -n $(APP_PACKAGE)/.ui.LibreOfficeUIActivity -e input
/assets/test1.odt
clean: properties
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
