PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3f9ec9f1: Merge "Disable notification alerts in Settings for SUW" into jb-dev

Browse Source 
* commit '3f9ec9f1c2744664ae637b9fbce99c115c60a429':
  Disable notification alerts in Settings for SUW
This commit is contained in:
Russell Brenner
2012-06-12 13:56:38 -07:00
committed by Android Git Automerger
parent 77a6080aeb 3f9ec9f1c2
commit 8b16c219f0
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -147,8 +147,6 @@ public class WifiSettings extends SettingsPreferenceFragment
// this boolean extra is set if we are being invoked by the Setup Wizard // 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_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? // should Next button only be enabled when we have a connection?
private boolean mEnableNextOnConnection; private boolean mEnableNextOnConnection;
@@ -322,9 +320,13 @@ public class WifiSettings extends SettingsPreferenceFragment
addPreferencesFromResource(R.xml.wifi_settings); addPreferencesFromResource(R.xml.wifi_settings);
// Back key is disabled if requested if (mSetupWizardMode) {
if (intent.getBooleanExtra(EXTRA_WIFI_DISABLE_BACK, false)) { getView().setSystemUiVisibility(
getView().setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK); 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 // On/off switch is hidden for Setup Wizard