Merge "Always show items in options menu for Wi-Fi Direct settings" am: 1e160cc8bf
am: 0173130d73
am: c31869a940
Change-Id: I545d38612f05c35949d37037c0744a57bcf8164f
This commit is contained in:
@@ -355,11 +355,9 @@ public class WifiP2pSettings extends DashboardFragment
|
||||
int textId = mWifiP2pSearching ? R.string.wifi_p2p_menu_searching :
|
||||
R.string.wifi_p2p_menu_search;
|
||||
menu.add(Menu.NONE, MENU_ID_SEARCH, 0, textId)
|
||||
.setEnabled(mWifiP2pEnabled)
|
||||
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
||||
.setEnabled(mWifiP2pEnabled);
|
||||
menu.add(Menu.NONE, MENU_ID_RENAME, 0, R.string.wifi_p2p_menu_rename)
|
||||
.setEnabled(mWifiP2pEnabled)
|
||||
.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
|
||||
.setEnabled(mWifiP2pEnabled);
|
||||
super.onCreateOptionsMenu(menu, inflater);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user