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

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
index 5d6491d31f46..1f713d4469a3 100644
--- 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();
     }