diff options
| author | Russell Brenner <russellbrenner@google.com> | 2012-06-12 13:56:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 13:56:38 -0700 |
| commit | 8b16c219f08521996a393c46a386185bb96903c6 (patch) | |
| tree | 5d8aa99f67e45e08d8971fc9aebd368d8342392e /src/com/android | |
| parent | 77a6080aebc9754bff2307edc1998bd54657fbb5 (diff) | |
| parent | 3f9ec9f1c2744664ae637b9fbce99c115c60a429 (diff) | |
| download | packages_apps_settings-8b16c219f08521996a393c46a386185bb96903c6.zip packages_apps_settings-8b16c219f08521996a393c46a386185bb96903c6.tar.gz packages_apps_settings-8b16c219f08521996a393c46a386185bb96903c6.tar.bz2 | |
am 3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev
* commit '3f9ec9f1c2744664ae637b9fbce99c115c60a429':
Disable notification alerts in Settings for SUW
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/wifi/WifiSettings.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 28b0f36..de42f2a 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -147,8 +147,6 @@ public class WifiSettings extends SettingsPreferenceFragment // this boolean extra is set if we are being invoked by the Setup Wizard private static final String EXTRA_IS_FIRST_RUN = "firstRun"; - private static final String EXTRA_WIFI_DISABLE_BACK = "wifi_disable_back"; - // should Next button only be enabled when we have a connection? private boolean mEnableNextOnConnection; @@ -322,9 +320,13 @@ public class WifiSettings extends SettingsPreferenceFragment addPreferencesFromResource(R.xml.wifi_settings); - // Back key is disabled if requested - if (intent.getBooleanExtra(EXTRA_WIFI_DISABLE_BACK, false)) { - getView().setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK); + if (mSetupWizardMode) { + getView().setSystemUiVisibility( + View.STATUS_BAR_DISABLE_BACK | + View.STATUS_BAR_DISABLE_HOME | + View.STATUS_BAR_DISABLE_RECENT | + View.STATUS_BAR_DISABLE_NOTIFICATION_ALERTS | + View.STATUS_BAR_DISABLE_CLOCK); } // On/off switch is hidden for Setup Wizard |