Merge "Fix clip rect when drawing accessibility focus rect" into lmp-dev
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();
}
/**