summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2012-09-21 08:39:34 +0200
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2012-09-21 08:41:06 +0200
commite8dcab34e5f6946a4f789c5983a8695a81f3bd10 (patch)
treeee7c9adb60412a36e295d59e9f9311f6b15965cc /android
parente1df1995d8a540316151169f9334b048194b3ffd (diff)
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
Diffstat (limited to 'android')
-rw-r--r--android/sdremote/AndroidManifest.xml15
1 files changed, 4 insertions, 11 deletions
diff --git a/android/sdremote/AndroidManifest.xml b/android/sdremote/AndroidManifest.xml
index 06056a264267..80a25410113b 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"