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

Commit 9cfa9b17 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 5681861a: am c47f80f1: Merge "Don\'t assume a default of \'false\' for... 

am 5681861a: am c47f80f1: Merge "Don\'t assume a default of \'false\' for TwoStatePreference" into jb-mr1-dev

* commit '5681861a':
  Don't assume a default of 'false' for TwoStatePreference
parents 3f0e4e70 5681861a

core/java/android/preference/TwoStatePreference.java

+9 −3
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ public abstract class TwoStatePreference extends Preference { 
    private CharSequence mSummaryOn;

    private CharSequence mSummaryOn;

    private CharSequence mSummaryOff;

    private CharSequence mSummaryOff;

    boolean mChecked;

    boolean mChecked;

    private boolean mCheckedSet;

    private boolean mSendClickAccessibilityEvent;

    private boolean mSendClickAccessibilityEvent;

    private boolean mDisableDependentsState;

    private boolean mDisableDependentsState;
@@ -74,13 +75,18 @@ public abstract class TwoStatePreference extends Preference { 
     * @param checked The checked state.

     * @param checked The checked state.

     */

     */

    public void setChecked(boolean checked) {

    public void setChecked(boolean checked) {

        if (mChecked != checked) {

        // Always persist/notify the first time; don't assume the field's default of false.

        final boolean changed = mChecked != checked;

        if (changed || !mCheckedSet) {

            mChecked = checked;

            mChecked = checked;

            mCheckedSet = true;

            persistBoolean(checked);

            persistBoolean(checked);

            if (changed) {

                notifyDependencyChange(shouldDisableDependents());

                notifyDependencyChange(shouldDisableDependents());

                notifyChanged();

                notifyChanged();

            }

            }

        }

        }

    }





    /**

    /**

     * Returns the checked state.

     * Returns the checked state.