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

Commit 6a811c88 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "settings: Unbreak wifi display on tablets" into cm-11.0

parents 8d8c59f4 91f47b9f

src/com/android/settings/wfd/WifiDisplaySettings.java

+15 −11
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { 


        if (activity instanceof PreferenceActivity) {

            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;

            if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {

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

                    R.dimen.action_bar_switch_padding);

            mActionBarSwitch.setPaddingRelative(0, 0, padding, 0);
@@ -165,13 +164,18 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment { 
                    ActionBar.LayoutParams.WRAP_CONTENT,

                    Gravity.CENTER_VERTICAL | Gravity.END));

        }

        }



        mEnabler = new WifiDisplayEnabler(getActivity(), mActionBarSwitch);



        super.onActivityCreated(savedInstanceState);

    }



    @Override

    public void onDestroyView() {

        getActivity().getActionBar().setCustomView(null);

        super.onDestroyView();

    }



    @Override

    public void onPause() {

        super.onPause();