summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAdam Powell <adamp@android.com>2013-07-16 17:12:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-16 17:12:49 -0700
commitf52ae147fbd5cba68fc679992ef320f067db76d6 (patch)
tree9e2a343e5dfe765b5ee3ebe387040d824ee0a7ba /core/java
parentaf093fd41438efd14e8aa55af79f853083dc9f07 (diff)
parent42658ed5182a75b82dd2b970a1f97fc30407d1e3 (diff)
downloadframeworks_base-f52ae147fbd5cba68fc679992ef320f067db76d6.zip
frameworks_base-f52ae147fbd5cba68fc679992ef320f067db76d6.tar.gz
frameworks_base-f52ae147fbd5cba68fc679992ef320f067db76d6.tar.bz2
am 42658ed5: am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"
* commit '42658ed5182a75b82dd2b970a1f97fc30407d1e3': Consider mScrollX when drawing the checkMarkDrawable
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/widget/CheckedTextView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/CheckedTextView.java b/core/java/android/widget/CheckedTextView.java
index f1c3139..40747f0 100644
--- a/core/java/android/widget/CheckedTextView.java
+++ b/core/java/android/widget/CheckedTextView.java
@@ -242,7 +242,7 @@ public class CheckedTextView extends TextView implements Checkable {
right = width - mBasePadding;
left = right - mCheckMarkWidth;
}
- checkMarkDrawable.setBounds( left, top, right, bottom);
+ checkMarkDrawable.setBounds(mScrollX + left, top, mScrollX + right, bottom);
checkMarkDrawable.draw(canvas);
}
}