commit b95c336d7863e6b63e2aa8682a90dd8ae213889c
author Alan Viverette <alanv@google.com> Fri Oct 17 17:19:12 2014 -0700
committer Alan Viverette <alanv@google.com> Fri Oct 17 17:19:12 2014 -0700
tree 99c30c0a012dd3439ff69b4899790dec4bc60c08
parent e4e3fcec415cdc9739f32ce1eaaec67666e5454d

Translate compound button drawable by scroll position

BUG: 18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904

core/java/android/widget/CompoundButton.java

diff --git a/core/java/android/widget/CompoundButton.java b/core/java/android/widget/CompoundButton.java
index 2ccd18d..7d9d305 100644
--- a/core/java/android/widget/CompoundButton.java
+++ b/core/java/android/widget/CompoundButton.java
@@ -398,7 +398,15 @@
         super.onDraw(canvas);
 
         if (buttonDrawable != null) {
-            buttonDrawable.draw(canvas);
+            final int scrollX = mScrollX;
+            final int scrollY = mScrollY;
+            if (scrollX == 0 && scrollY == 0) {
+                buttonDrawable.draw(canvas);
+            } else {
+                canvas.translate(scrollX, scrollY);
+                buttonDrawable.draw(canvas);
+                canvas.translate(-scrollX, -scrollY);
+            }
         }
     }