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

Restore look of Wi-Fi panel for Setup Wizard

Browse Source 
As part of the Wi-Fi refresh, this CL hides the action bar, menu, and
Settings icon in the context of the Setup Wizard. Dead code related
to WifiSettingsForSetupWizardXL has also been removed.

Bug: 5364589
Change-Id: Ib6716500153879b939a18a7007f1f6521b73890b
This commit is contained in:
Russell Brenner
2012-04-23 11:38:34 -07:00
parent bd4bac327b
commit fc5dd2cbf0
4 changed files with 58 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/WifiPickerActivity.java
View File

@@ -29,6 +29,8 @@ public class WifiPickerActivity extends PreferenceActivity implements ButtonBarH
private static final String EXTRA_PREFS_SHOW_BUTTON_BAR = "extra_prefs_show_button_bar";
private static final String EXTRA_PREFS_SET_NEXT_TEXT = "extra_prefs_set_next_text";
private static final String EXTRA_PREFS_SET_BACK_TEXT = "extra_prefs_set_back_text";
private static final String EXTRA_WIFI_SHOW_ACTION_BAR = "wifi_show_action_bar";
private static final String EXTRA_WIFI_SHOW_MENUS = "wifi_show_menus";
@Override
public Intent getIntent() {
@@ -67,6 +69,14 @@ public class WifiPickerActivity extends PreferenceActivity implements ButtonBarH
intent.putExtra(EXTRA_PREFS_SET_BACK_TEXT,
orgIntent.getStringExtra(EXTRA_PREFS_SET_BACK_TEXT));
}
if (orgIntent.hasExtra(EXTRA_WIFI_SHOW_ACTION_BAR)) {
intent.putExtra(EXTRA_WIFI_SHOW_ACTION_BAR,
orgIntent.getBooleanExtra(EXTRA_WIFI_SHOW_ACTION_BAR, true));
}
if (orgIntent.hasExtra(EXTRA_WIFI_SHOW_MENUS)) {
intent.putExtra(EXTRA_WIFI_SHOW_MENUS,
orgIntent.getBooleanExtra(EXTRA_WIFI_SHOW_MENUS, true));
}
if (resultTo == null) {
startActivity(intent);