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

Jean-Baptiste Queru · Android Git Automerger · commit 4ea6a8eb9fdf · 2012-08-20T14:50:40.000-07:00
* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
  Switch widget: Fix ON/OFF option update error
diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
@@ -686,7 +686,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
`@@ -686,7 +686,7 @@ private boolean getTargetCheckedState() {`
`686`	`686`	`@Override`
`687`	`687`	`public void setChecked(boolean checked) {`
`688`	`688`	`super.setChecked(checked);`
`689`		`- mThumbPosition = checked ? getThumbScrollRange() : 0;`
	`689`	`+ mThumbPosition = isChecked() ? getThumbScrollRange() : 0;`
`690`	`690`	`invalidate();`
`691`	`691`	`}`
`692`	`692`