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