Skip to content

Commit 5454bc1

Browse files
alanvAndroid (Google) Code Review
authored andcommitted
Merge "Use correct checked value when animating Switch" into lmp-dev
2 parents e25547b + 467d629 commit 5454bc1

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

core/java/android/widget/Switch.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -833,6 +833,10 @@ public void toggle() {
833833
public void setChecked(boolean checked) {
834834
super.setChecked(checked);
835835

836+
// Calling the super method may result in setChecked() getting called
837+
// recursively with a different value, so load the REAL value...
838+
checked = isChecked();
839+
836840
if (isAttachedToWindow() && isLaidOut()) {
837841
animateThumbToCheckedState(checked);
838842
} else {

0 commit comments

Comments
 (0)