summaryrefslogtreecommitdiff
path: root/core/java/android/widget/Switch.java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-20 14:57:23 -0700
committerJean-Baptiste Queru <jbq@google.com>2012-08-20 14:57:23 -0700
commitacbbd1142db522b15d06d6a1e076463e5c55c8b3 (patch)
treead656ed1dc6d720ce90ff2e577c6bde8ea0510da /core/java/android/widget/Switch.java
parent7b7feee80331deed883602d5861074ca66293e9c (diff)
parent4ea6a8eb9fdf83f5327e6c8b65a3d5dac8075f8f (diff)
resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev
Change-Id: I51b1732011f31ea07087ef0898b47de8977074de
Diffstat (limited to 'core/java/android/widget/Switch.java')
-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 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();
}