1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/widget/CompoundButton.java b/core/java/android/widget/CompoundButton.java
index 2ccd18d9b7eb..7d9d3052fe22 100644
--- a/core/java/android/widget/CompoundButton.java
+++ b/core/java/android/widget/CompoundButton.java
@@ -398,7 +398,15 @@ public abstract class CompoundButton extends Button implements Checkable {
         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);
+            }
         }
     }