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

Commit 1248bdca authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Make sure we're using an up-to-date disable state when we're reloaded." into cm-10.1

parents 4522a5a5 b7c32f3c
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ public class ToggleLockscreenTile extends QuickSettingsTile {
    private static final String KEY_DISABLED = "lockscreen_disabled";

    private final KeyguardManager mKeyguardManager;
    private boolean mDisabledLockscreen = false;
    private SharedPreferences sp;
    private boolean mDisabledLockscreen;
    private SharedPreferences mPrefs;

    public ToggleLockscreenTile(Context context,
            LayoutInflater inflater, QuickSettingsContainerView container, QuickSettingsController qsc) {
@@ -30,6 +30,8 @@ public class ToggleLockscreenTile extends QuickSettingsTile {
        mLabel = mContext.getString(R.string.quick_settings_lockscreen);

        mKeyguardManager = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
        mPrefs = mContext.getSharedPreferences("PowerButton-" + PowerButton.BUTTON_LOCKSCREEN, Context.MODE_PRIVATE);
        mDisabledLockscreen = mPrefs.getBoolean(KEY_DISABLED, false);

        mOnClick = new OnClickListener() {

@@ -37,8 +39,7 @@ public class ToggleLockscreenTile extends QuickSettingsTile {
            public void onClick(View v) {
                mDisabledLockscreen = !mDisabledLockscreen;

                sp = mContext.getSharedPreferences("PowerButton-" + PowerButton.BUTTON_LOCKSCREEN, Context.MODE_PRIVATE);
                SharedPreferences.Editor editor = sp.edit();
                SharedPreferences.Editor editor = mPrefs.edit();
                editor.putBoolean(KEY_DISABLED, mDisabledLockscreen);
                editor.apply();