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

Commit 99f98bb1 authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "show the dream enable switch in all conditions." into jb-mr1-dev

parents 6f2ca5bc 63707af9

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