[Libreoffice-commits] .: android/sdremote

[Libreoffice Gerrit user]

 android/sdremote/AndroidManifest.xml |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

New commits:
commit e8dcab34e5f6946a4f789c5983a8695a81f3bd10
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Fri Sep 21 08:39:34 2012 +0200

    Use android:logo + separate label in intent-filter for proper naming.
    
    It appears that activity-alias is actually misleading, by using
    android:logo a different icon is used in the actionbar than in
    the launcher, and setting android:label in the intent-filter
    sets the desired launcher title.
    
    Change-Id: I06e0ddc83498333ec45bdd83d56c47451e59df2a

diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml
index 06056a2..80a2541 100644
--- a/android/sdremote/AndroidManifest.xml
+++ b/android/sdremote/AndroidManifest.xml
@@ -19,23 +19,16 @@
         android:title="@string/app_name" >
         <activity
             android:name=".SelectorActivity"
-            android:icon="@drawable/actionbar_icon_computer"
             android:label="@string/selector_choose_a_computer"
+            android:logo="@drawable/actionbar_icon_computer"
             android:title="@string/app_name"
             android:uiOptions="splitActionBarWhenNarrow" >
-        </activity>
-
-        <activity-alias
-            android:name=".FakeLauncher"
-            android:icon="@drawable/ic_launcher"
-            android:label="@string/app_name"
-            android:targetActivity=".SelectorActivity" >
-            <intent-filter>
+            <intent-filter android:label="@string/app_name" >
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity-alias>
-
+        </activity>
         <activity
             android:name=".PairingActivity"
             android:icon="@drawable/actionbar_icon_computer"