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

Commit a6ff69ed authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Show screen saver toggle on tablets." into ics-mr1

parents 21b5d18b c949ef6e

src/com/android/settings/DreamSettings.java

+13 −12
Original line number Diff line number Diff line
@@ -69,7 +69,9 @@ public class DreamSettings extends SettingsPreferenceFragment { 


        if (activity instanceof PreferenceActivity) {

            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;

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

            // note: we do not check onIsHidingHeaders() or onIsMultiPane() because there's no

            // switch in the left-hand pane to control this; we need to show the ON/OFF in our

            // fragment every time

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

                    R.dimen.action_bar_switch_padding);

            mEnableSwitch.setPadding(0, 0, padding, 0);
@@ -81,7 +83,6 @@ public class DreamSettings extends SettingsPreferenceFragment { 
                    Gravity.CENTER_VERTICAL | Gravity.RIGHT));

            activity.getActionBar().setTitle(R.string.screensaver_settings_title);

        }

        }



        mEnabler = new Enabler(activity, mEnableSwitch);

    }