resolved conflicts for merge of 4ea6a8e to jb-mr1-dev

Jean-Baptiste Queru · Jean-Baptiste Queru · commit acbbd1142db5 · 2012-08-20T14:57:23.000-07:00
Change-Id: I51b1732011f31ea07087ef0898b47de8977074de
diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
@@ -664,7 +664,7 @@ private void setThumbPosition(boolean checked) {
     @Override
     public void setChecked(boolean checked) {
         super.setChecked(checked);
-        setThumbPosition(checked);
+        setThumbPosition(isChecked());
         invalidate();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ private void setThumbPosition(boolean checked) {`
`664`	`664`	`@Override`
`665`	`665`	`public void setChecked(boolean checked) {`
`666`	`666`	`super.setChecked(checked);`
`667`		`- setThumbPosition(checked);`
	`667`	`+ setThumbPosition(isChecked());`
`668`	`668`	`invalidate();`
`669`	`669`	`}`
`670`	`670`