am e99006f7: Merge "Add wps icon to wifi panel" into jb-dev

* commit 'e99006f75b2639dbe910a318516f13b13af47480':
  Add wps icon to wifi panel
This commit is contained in:
Russell Brenner
2012-05-15 20:34:12 -07:00
committed by Android Git Automerger
4 changed files with 1 additions and 0 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

View File

@@ -344,6 +344,7 @@ public class WifiSettings extends SettingsPreferenceFragment
if (mSetupWizardMode) {
// FIXME: add setIcon() when graphics are available
menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
.setIcon(R.drawable.ic_wps)
.setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)