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

am cfadc35a: Add WPS Push Button back into Setup Wizard Wi-Fi

Browse Source 
* commit 'cfadc35af8236cedb157a89b3c591c1afb2b761c':
  Add WPS Push Button back into Setup Wizard Wi-Fi
This commit is contained in:
Russell Brenner
2012-05-07 09:49:15 -07:00
committed by Android Git Automerger
parent 30ec99e563 cfadc35af8
commit ab824bb169
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,9 @@ public class WifiSettings extends SettingsPreferenceFragment
if (mShowMenu) { if (mShowMenu) {
registerForContextMenu(getListView()); registerForContextMenu(getListView());
} }
setHasOptionsMenu(mShowMenu); // FIXME: When WPS image button is implemented, use mShowMenu instead of always showing
// the options menu
setHasOptionsMenu(true);
// After confirming PreferenceScreen is available, we call super. // After confirming PreferenceScreen is available, we call super.
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
@@ -304,8 +306,8 @@ public class WifiSettings extends SettingsPreferenceFragment
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
if (mShowMenu) { if (mShowMenu) {
final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc) menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
.setEnabled(wifiIsEnabled) .setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
@@ -327,6 +329,11 @@ public class WifiSettings extends SettingsPreferenceFragment
menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced) menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
//.setIcon(android.R.drawable.ic_menu_manage) //.setIcon(android.R.drawable.ic_menu_manage)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER); .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
} else {
// FIXME: Interim support for WPS, until ImageButton is available
menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
.setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
} }
super.onCreateOptionsMenu(menu, inflater); super.onCreateOptionsMenu(menu, inflater);
} }