From a9c55d8dbde4f9e081528e630292ef0d37ea2faf Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Fri, 28 Sep 2012 16:40:42 -0700
Subject: [PATCH] Make Settings shortcuts launch into the correct
 activity/fragment.

Bug: 6959454

Change the task affinities so that the shortcuts are not tied to
Settings main task.

Change-Id: I7729d17d8144a4a57f0d135fe80bdbd7af8dad01
---
 AndroidManifest.xml                           |  30 +++++++++---------
 res/drawable/ic_user_orange.png               | Bin 0 -> 5043 bytes
 .../android/settings/users/UserSettings.java  |   2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 res/drawable/ic_user_orange.png

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2405c6c519b..c7bf9666e9a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -121,7 +121,7 @@
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:label="@string/wifi_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:parentActivityName="Settings">
@@ -264,7 +264,7 @@
 
         <activity android:name="Settings$BluetoothSettingsActivity"
                 android:label="@string/bluetooth_settings_title"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -303,7 +303,7 @@
 
         <activity android:name="Settings$TetherSettingsActivity"
                 android:label="@string/tether_settings_title_all"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -358,7 +358,7 @@
 
         <activity android:name="Settings$VpnSettingsActivity"
                 android:label="@string/vpn_settings_title"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings$WirelessSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -547,7 +547,7 @@
 
         <activity android:name="Settings$SoundSettingsActivity"
                 android:label="@string/sound_settings"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -576,7 +576,7 @@
 
         <activity android:name="Settings$DisplaySettingsActivity"
                 android:label="@string/display_settings"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -641,7 +641,7 @@
 
         <activity android:name="Settings$ManageApplicationsActivity"
                 android:label="@string/applications_settings"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings"
                 android:uiOptions="none">
             <intent-filter>
@@ -707,7 +707,7 @@
         <activity android:name=".applications.InstalledAppDetailsTop"
                   android:label="@string/application_info_label"
                   android:exported="true"
-                  android:taskAffinity="com.android.settings"
+                  android:taskAffinity=""
                   android:parentActivityName="Settings$ManageApplicationsActivity">
         </activity>
 
@@ -743,7 +743,7 @@
         <!-- Provide direct entry into manage apps showing storage usage of apps. -->
         <activity android:name="Settings$StorageUseActivity"
                 android:label="@string/storageuse_settings_title"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -761,7 +761,7 @@
         <activity android:name="Settings$LocationSettingsActivity"
                 android:label="@string/location_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -780,7 +780,7 @@
         <activity android:name="Settings$SecuritySettingsActivity"
                 android:label="@string/security_settings_title"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -900,7 +900,7 @@
         <activity android:name="Settings$AccessibilitySettingsActivity"
                 android:label="@string/accessibility_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1325,7 +1325,7 @@
         <activity android:name="Settings$PowerUsageSummaryActivity"
                 android:label="@string/power_usage_summary_title"
                 android:uiOptions="none"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1352,7 +1352,7 @@
 
         <activity android:name="Settings$AccountSyncSettingsActivity"
             android:label="@string/account_sync_settings_title"
-            android:taskAffinity="com.android.settings"
+            android:taskAffinity=""
             android:parentActivityName="Settings"
             android:uiOptions="none">
             <intent-filter>
@@ -1437,7 +1437,7 @@
         <activity android:name="Settings$DataUsageSummaryActivity"
                 android:label="@string/data_usage_summary_title"
                 android:uiOptions="none"
-                android:taskAffinity="com.android.settings"
+                android:taskAffinity=""
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/res/drawable/ic_user_orange.png b/res/drawable/ic_user_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..789d8928fa8251e14711f48a13f24be3e4ff57ea
GIT binary patch
literal 5043
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
JPDHLkV1g$rcWeLv

literal 0
HcmV?d00001

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index dcb5ac2eac8..33b4195d263 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -85,7 +85,7 @@ public class UserSettings extends SettingsPreferenceFragment
             "key_add_user_long_message_displayed";
 
     private static final int[] USER_DRAWABLES = {
-        R.drawable.ic_user,
+        R.drawable.ic_user_orange,
         R.drawable.ic_user_cyan,
         R.drawable.ic_user_green,
         R.drawable.ic_user_purple,