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

2014-09-04 20:44:37 +00:00
parent 127343cb46 eb3ca22426
commit c65e9a480a
1 changed files with 3 additions and 1 deletions
--- 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();
    }

    /**