summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-20 14:50:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-20 14:50:40 -0700
commit4ea6a8eb9fdf83f5327e6c8b65a3d5dac8075f8f (patch)
tree035d6a6db77bda88d29fb9355330adc6c778b095
parent7d5b22afae8525cdf80ba1bf8e18b87d597f830d (diff)
parentf515c6f4fe4457de1d5c49f78f9dcf6e4379e335 (diff)
downloadframeworks_base-4ea6a8eb9fdf83f5327e6c8b65a3d5dac8075f8f.zip
frameworks_base-4ea6a8eb9fdf83f5327e6c8b65a3d5dac8075f8f.tar.gz
frameworks_base-4ea6a8eb9fdf83f5327e6c8b65a3d5dac8075f8f.tar.bz2
am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"
* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335': Switch widget: Fix ON/OFF option update error
-rw-r--r--core/java/android/widget/Switch.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class Switch extends CompoundButton {
@Override
public void setChecked(boolean checked) {
super.setChecked(checked);
- mThumbPosition = checked ? getThumbScrollRange() : 0;
+ mThumbPosition = isChecked() ? getThumbScrollRange() : 0;
invalidate();
}