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

Commit cfadc35a authored by Russell Brenner's avatar Russell Brenner
Browse files

Add WPS Push Button back into Setup Wizard Wi-Fi 

This isn't yet the image button shown in the UX flows, but pending
artwork and some potential tricky Preference layout changes, this
will give access to the WPS functionality.

Bug: 6449333
Change-Id: Ibda0e48cf972dad10c7e92a7482fca9b3c104559
parent 96d7eaf5

src/com/android/settings/wifi/WifiSettings.java

+9 −2
Original line number Diff line number Diff line
@@ -269,7 +269,9 @@ public class WifiSettings extends SettingsPreferenceFragment 
        if (mShowMenu) {

            registerForContextMenu(getListView());

        }

        setHasOptionsMenu(mShowMenu);

        // FIXME: When WPS image button is implemented, use mShowMenu instead of always showing

        // the options menu

        setHasOptionsMenu(true);



        // After confirming PreferenceScreen is available, we call super.

        super.onActivityCreated(savedInstanceState);
@@ -304,8 +306,8 @@ public class WifiSettings extends SettingsPreferenceFragment 


    @Override

    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {

        if (mShowMenu) {

        final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();

        if (mShowMenu) {

            menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)

                    .setEnabled(wifiIsEnabled)

                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
@@ -327,6 +329,11 @@ public class WifiSettings extends SettingsPreferenceFragment 
            menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)

                    //.setIcon(android.R.drawable.ic_menu_manage)

                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);

        } else {

            // FIXME: Interim support for WPS, until ImageButton is available

            menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)

                    .setEnabled(wifiIsEnabled)

                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);

        }

        super.onCreateOptionsMenu(menu, inflater);

    }