Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f9ec9f1 authored by Russell Brenner's avatar Russell Brenner Committed by Android (Google) Code Review
Browse files

Merge "Disable notification alerts in Settings for SUW" into jb-dev

parents b5858bbd 58d6ffc5

src/com/android/settings/wifi/WifiSettings.java

+7 −5
Original line number Diff line number Diff line
@@ -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