commit c65e9a480ae50ea01a1aeaf2492213ecdab92c08
author Alan Viverette <alanv@google.com> Thu Sep 04 20:44:37 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 20:44:38 2014 +0000
tree 4e4345f1b2b9ee30fa7c4ad1a28413a5920f734a
parent 127343cb460c8d23f9fb59bcf4bcea6e9b9cea03
parent eb3ca22426f2789761a5f4b25f258722a3a6b68b

Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 21e7c6b..aeacf50 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -15091,10 +15091,12 @@
             bounds.set(0, 0, mRight - mLeft, mBottom - mTop);
         }
 
+        canvas.save();
         canvas.translate(mScrollX, mScrollY);
+        canvas.clipRect(bounds, Region.Op.REPLACE);
         drawable.setBounds(bounds);
         drawable.draw(canvas);
-        canvas.translate(-mScrollX, -mScrollY);
+        canvas.restore();
     }
 
     /**