summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2014-09-04 20:44:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-09-04 20:44:38 +0000
commitc65e9a480ae50ea01a1aeaf2492213ecdab92c08 (patch)
tree4e4345f1b2b9ee30fa7c4ad1a28413a5920f734a
parent127343cb460c8d23f9fb59bcf4bcea6e9b9cea03 (diff)
parenteb3ca22426f2789761a5f4b25f258722a3a6b68b (diff)
Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev
-rw-r--r--core/java/android/view/View.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 21e7c6b3c220..aeacf506ed97 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -15091,10 +15091,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
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();
}
/**