Makefile.in | 1 +
android/experimental/LOAndroid3/AndroidManifest.xml.in | 3 +++
2 files changed, 4 insertions(+)
New commits:
commit 737cd06a4ba94be234df08c3019abc8412475d78
Author: Jan Holesovsky <ke...@collabora.com>
Date: Fri Oct 10 08:21:25 2014 +0200
android: Disable LibreOfficeUIActivity for now.
We should provide just one activity in the .apk; the browser should probably
show up when LibreOffice Viewer is started with no file to open...
Change-Id: I624afa00f7e8ddc649a272c1b08899e8aac887c9
diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in
b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index cfd369a..989a43c 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -71,6 +71,8 @@
</intent-filter>
</activity>
<!-- Document Browser Activity -->
+ <!-- Disable it here so that we don't present two icons.
+ TODO Probably merge the two activities, so that the browser opens
when LibreOffice is started with no document.
<activity android:name=".ui.LibreOfficeUIActivity"
android:label="@string/browser_app_name"
android:theme="@android:style/Theme.Holo">
@@ -79,6 +81,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ -->
</application>
</manifest>
commit 8ae3ae0ba735b6610ed7b7b3b2b49eb0af7bfaa5
Author: Jan Holesovsky <ke...@collabora.com>
Date: Fri Oct 10 08:20:58 2014 +0200
android: Re-autogen when AndroidManifest.xml.in changes.
Change-Id: I53cf6bf10f25702d9ae42afb6846411a3e31c187
diff --git a/Makefile.in b/Makefile.in
index 9f5dd1a..302e782 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,6 +42,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
$(SRCDIR)/configure.ac \
$(SRCDIR)/config_host/*.h.in \
+
$(SRCDIR)/android/experimental/LOAndroid3/AndroidManifest.xml.in \
$(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun \
)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
