am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev

* commit '8bb154c272dbd11922d74e882a538ea9af6cd7db': Switch widget: Fix ON/OFF option update error
2012-08-20 15:25:43 -07:00
parent 3df15bf37a 8bb154c272
commit 6ba73cc662
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();
    }