Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev

2012-08-20 15:23:16 -07:00
parent ca7a9ef0e5 acbbd1142d
commit 8bb154c272
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/Switch.java
+++ b/core/java/android/widget/Switch.java
@ -664,7 +664,7 @@ public class Switch extends CompoundButton {
    @Override
    public void setChecked(boolean checked) {
        super.setChecked(checked);
-        setThumbPosition(checked);
+        setThumbPosition(isChecked());
        invalidate();
    }