Merge "Switch widget: Fix ON/OFF option update error"

Jean-Baptiste Queru · android code review · commit f515c6f4fe44 · 2012-08-20T14:28:33.000-07:00
diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
@@ -675,7 +675,7 @@ private boolean getTargetCheckedState() {
     @Override
     public void setChecked(boolean checked) {
         super.setChecked(checked);
-        mThumbPosition = checked ? getThumbScrollRange() : 0;
+        mThumbPosition = isChecked() ? getThumbScrollRange() : 0;
         invalidate();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ private boolean getTargetCheckedState() {`
`675`	`675`	`@Override`
`676`	`676`	`public void setChecked(boolean checked) {`
`677`	`677`	`super.setChecked(checked);`
`678`		`- mThumbPosition = checked ? getThumbScrollRange() : 0;`
	`678`	`+ mThumbPosition = isChecked() ? getThumbScrollRange() : 0;`
`679`	`679`	`invalidate();`
`680`	`680`	`}`
`681`	`681`