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

Commit 565d8b7b authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix bug #13327889 Launching Wifi setting using available wifi network 

...notification does not show ON/OFF button for wifi

- the notification was launching the WifiPickerActivity which is
a PreferenceActivity, so take care of this case too.

Change-Id: I64f58d4b9f75141626bb6f0266cf2f17fbb39fc7
parent 835c5e4e

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

+17 −11
Original line number Diff line number Diff line
@@ -409,10 +409,17 @@ public class WifiSettings extends RestrictedSettingsFragment 
            final Activity activity = getActivity();



            mSwitch = new Switch(activity);

            boolean addSwitch = false;



            if (activity instanceof SettingsActivity) {

                SettingsActivity sa = (SettingsActivity) activity;

                if (!sa.onIsHidingHeaders()) {

                addSwitch = !sa.onIsHidingHeaders();

            } else if (activity instanceof WifiPickerActivity) {

                PreferenceActivity pa = (PreferenceActivity) activity;

                addSwitch = pa.onIsHidingHeaders();

            }



            if (addSwitch) {

                final int padding = activity.getResources().getDimensionPixelSize(

                        R.dimen.action_bar_switch_padding);

                mSwitch.setPaddingRelative(0, 0, padding, 0);
@@ -423,7 +430,6 @@ public class WifiSettings extends RestrictedSettingsFragment 
                        ActionBar.LayoutParams.WRAP_CONTENT,

                        Gravity.CENTER_VERTICAL | Gravity.END));

            }

            }



            mWifiEnabler = new WifiEnabler(activity, mSwitch);

        }