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

Commit c47f80f1 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Don't assume a default of 'false' for TwoStatePreference" into jb-mr1-dev

parents f5fd82ac c1b07211

core/java/android/preference/TwoStatePreference.java

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

    private CharSequence mSummaryOff;

    boolean mChecked;

    private boolean mCheckedSet;

    private boolean mSendClickAccessibilityEvent;

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

     */

    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;

            mCheckedSet = true;

            persistBoolean(checked);

            if (changed) {

                notifyDependencyChange(shouldDisableDependents());

                notifyChanged();

            }

        }

    }



    /**

     * Returns the checked state.