summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-09-28 16:40:42 -0700
committerAmith Yamasani <yamasani@google.com>2012-09-30 13:46:51 -0700
commita9c55d8dbde4f9e081528e630292ef0d37ea2faf (patch)
treee3abda6f287ae2e61ee0a3ef8f7e250c98c725f9
parent990c5f2432add56ce6a32cb7c40c4c8bff1e8e5c (diff)
downloadpackages_apps_settings-a9c55d8dbde4f9e081528e630292ef0d37ea2faf.zip
packages_apps_settings-a9c55d8dbde4f9e081528e630292ef0d37ea2faf.tar.gz
packages_apps_settings-a9c55d8dbde4f9e081528e630292ef0d37ea2faf.tar.bz2
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
-rw-r--r--AndroidManifest.xml30
-rw-r--r--res/drawable/ic_user_orange.pngbin0 -> 5043 bytes
-rw-r--r--src/com/android/settings/users/UserSettings.java2
3 files changed, 16 insertions, 16 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2405c6c..c7bf966 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 0000000..789d892
--- /dev/null
+++ b/res/drawable/ic_user_orange.png
Binary files differ
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index dcb5ac2..33b4195 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,