commit 4ea6a8eb9fdf83f5327e6c8b65a3d5dac8075f8f
author Jean-Baptiste Queru <jbq@google.com> Mon Aug 20 14:50:40 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 20 14:50:40 2012 -0700
tree 035d6a6db77bda88d29fb9355330adc6c778b095
parent 7d5b22afae8525cdf80ba1bf8e18b87d597f830d
parent f515c6f4fe4457de1d5c49f78f9dcf6e4379e335

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

* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
  Switch widget: Fix ON/OFF option update error

core/java/android/widget/Switch.java

diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java
index 56f6651..cea613f 100644
--- a/core/java/android/widget/Switch.java
+++ b/core/java/android/widget/Switch.java
@@ -686,7 +686,7 @@
     @Override
     public void setChecked(boolean checked) {
         super.setChecked(checked);
-        mThumbPosition = checked ? getThumbScrollRange() : 0;
+        mThumbPosition = isChecked() ? getThumbScrollRange() : 0;
         invalidate();
     }