[Libreoffice-commits] core.git: android/experimental

[Jacobo Aragunde Pérez]

 android/experimental/LOAndroid3/AndroidManifest.xml.in |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 6d7f67eadf7cae75ec0ede5596c55b6585d73872
Author: Jacobo Aragunde Pérez <jaragunde at igalia.com>
Date:   Wed Oct 15 19:39:29 2014 +0200

    android: Show document browser back in the menu
    
    Related with commit c7c2b4b54d8ab81150e9b71433970c2f338ed063.
    
    There is nothing wrong with having several activities; in fact Android
    development encourages using one activity per use case. After this
    patch we have:
    
    * One menu item that opens LibreOffice document browser. It covers the
      use case "open LibreOffice without documents".
    * The viewer activity does not have a menu item but it responds to
      open intents triggered by any applications like file explorers,
      including the document browser.
    
    Change-Id: Ie08b96e52d3a6a79aed3354620302705d7689381
    Reviewed-on: https://gerrit.libreoffice.org/12108
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/android/experimental/LOAndroid3/AndroidManifest.xml.in b/android/experimental/LOAndroid3/AndroidManifest.xml.in
index 119046a8..c3a6b31 100644
--- a/android/experimental/LOAndroid3/AndroidManifest.xml.in
+++ b/android/experimental/LOAndroid3/AndroidManifest.xml.in
@@ -17,15 +17,12 @@
         android:label="@string/app_name"
         android:hardwareAccelerated="true"
         android:theme="@style/AppTheme">
+        <!-- Viewer Activity -->
         <activity
             android:name="org.libreoffice.LibreOfficeMainActivity"
             android:label="@string/app_name"
             android:configChanges="orientation|keyboard|keyboardHidden|screenLayout|uiMode|screenSize|smallestScreenSize">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-            <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.EDIT" />
                 <action android:name="android.intent.action.PICK" />
@@ -84,17 +81,14 @@
             </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:label="@string/app_name"
                   android:theme="@android:style/Theme.Holo">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        -->
     </application>
 
 </manifest>