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

Commit 63707af9 authored by Chris Wren's avatar Chris Wren
Browse files

show the dream enable switch in all conditions. 

Bug: 7229905
Change-Id: I3fc3b2e8ce1e8bb08c72daed9c5d33ce5ff343c6
parent 49dc9825

src/com/android/settings/DreamSettings.java

+17 −14
Original line number Diff line number Diff line
@@ -96,9 +96,7 @@ public class DreamSettings 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);

        mSwitch.setPadding(0, 0, padding, 0);
@@ -108,11 +106,16 @@ public class DreamSettings extends SettingsPreferenceFragment { 
                ActionBar.LayoutParams.WRAP_CONTENT,

                ActionBar.LayoutParams.WRAP_CONTENT,

                Gravity.CENTER_VERTICAL | Gravity.END));

            }

        }



        setHasOptionsMenu(true);

    }



    @Override

    public void onDestroyView() {

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

        super.onDestroyView();

    }



    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        logd("onActivityCreated(%s)", savedInstanceState);