commit c31869a9404e40648bbec7464e87df63dfee106d
author ChenChen Chen <chenchen.x.chen@sony.com> Thu Aug 16 20:29:49 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 16 20:29:49 2018 -0700
tree d2a4497f6d371d7f85535d07ebc3c71b3f2f18a4
parent e48cf70a966a3bd8f62e2293b867227c3f540c61
parent 0173130d73206583a595cb2eb23e943e9de99358

Merge "Always show items in options menu for Wi-Fi Direct settings" am: 1e160cc8bf
am: 0173130d73

Change-Id: I7e70b3f2140301673b45beb3fb7ad7ed2d848a1d

src/com/android/settings/wifi/p2p/WifiP2pSettings.java

diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 7ef10e5..f26564d 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -354,11 +354,9 @@
         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);
     }