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

Commit a1b187ac authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #13327889 Launching Wifi setting using available wifi network... 

Merge "Fix bug #13327889 Launching Wifi setting using available wifi network ...notification does not show ON/OFF button for wifi"
parents 1f7b93c5 565d8b7b

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);

        }