summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-02-19 03:46:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-19 03:46:17 +0000
commitf7398fceac43616d33ada0364c919f6ee3aafa32 (patch)
tree06aa6a51504a6ce49bacb12fd3474a128de90cb0
parent4ecd8d4d9ade72a2fb73558c465c3d561085a399 (diff)
parent2858b790ad92bb39e26150d696432f0b717bcddc (diff)
downloadpackages_apps_Settings-f7398fceac43616d33ada0364c919f6ee3aafa32.zip
packages_apps_Settings-f7398fceac43616d33ada0364c919f6ee3aafa32.tar.gz
packages_apps_Settings-f7398fceac43616d33ada0364c919f6ee3aafa32.tar.bz2
Merge "Fix bug #13027956 For restricted user launching Settings app from all apps drawer ...by default opens wifi setting screen"
-rw-r--r--src/com/android/settings/SettingsActivity.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index bbe0e74..b4970c1 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -226,7 +226,8 @@ public class SettingsActivity extends Activity
R.id.accessibility_settings,
R.id.print_settings,
R.id.nfc_payment_settings,
- R.id.home_settings
+ R.id.home_settings,
+ R.id.dashboard
};
private static final String[] ENTRY_FRAGMENTS = {