Merge "Use icons in wifi settings" into jb-dev

This commit is contained in:
Irfan Sheriff
2012-05-16 14:18:43 -07:00
committed by Android (Google) Code Review

View File

@@ -352,9 +352,11 @@ public class WifiSettings extends SettingsPreferenceFragment
.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
} else { } else {
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)
.setIcon(R.drawable.ic_wps)
.setEnabled(wifiIsEnabled) .setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network) menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
.setIcon(R.drawable.ic_menu_add)
.setEnabled(wifiIsEnabled) .setEnabled(wifiIsEnabled)
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan) menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan)