Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c31869a9 authored by ChenChen Chen's avatar ChenChen Chen Committed by android-build-merger
Browse files

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

am: 0173130d

Change-Id: I7e70b3f2140301673b45beb3fb7ad7ed2d848a1d
parents e48cf70a 0173130d

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

+2 −4
Original line number Diff line number Diff line
@@ -354,11 +354,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);

    }