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

am a4139dc0: Merge "Hide Back button when requesting intent says to" into jb-dev

Browse Source 
* commit 'a4139dc0e5db8eead3bbb4f68167e86a2a6402a5':
  Hide Back button when requesting intent says to
This commit is contained in:
Andrew Flynn
2012-05-09 01:48:35 -07:00
committed by Android Git Automerger
parent b5b56d714d a4139dc0e5
commit f2c3939e89
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,9 +133,9 @@ public class WifiSettings extends SettingsPreferenceFragment
// this boolean extra specifies whether to disable the Next button when not connected
private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
private static final String EXTRA_WIFI_SHOW_ACTION_BAR = "wifi_show_action_bar";
private static final String EXTRA_WIFI_SHOW_MENUS = "wifi_show_menus";
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;
@@ -238,6 +238,11 @@ 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);
}
// Action bar is hidden for Setup Wizard
final boolean showActionBar = intent.getBooleanExtra(EXTRA_WIFI_SHOW_ACTION_BAR, true);
if (showActionBar) {