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

Commit 0d2e2c2b authored by Yinglei Wang's avatar Yinglei Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix setting state description of toggle button and switch"

parents a261d615 6a55e06d

core/java/android/widget/Switch.java

+3 −0
Original line number Diff line number Diff line
@@ -309,6 +309,9 @@ public class Switch extends CompoundButton { 


        // Refresh display with current params

        refreshDrawableState();

        // Default state is derived from on/off-text, so state has to be updated when on/off-text

        // are updated.

        setDefaultStateDescritption();

        setChecked(isChecked());

    }

core/java/android/widget/ToggleButton.java

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ public class ToggleButton extends CompoundButton { 
        mTextOff = a.getText(com.android.internal.R.styleable.ToggleButton_textOff);

        mDisabledAlpha = a.getFloat(com.android.internal.R.styleable.ToggleButton_disabledAlpha, 0.5f);

        syncTextState();

        // Default state is derived from on/off-text, so state has to be updated when on/off-text

        // are updated.

        setDefaultStateDescritption();

        a.recycle();

    }