Merge "Force clipping on layers that fail to be allocated" into jb-mr2-dev

2013-04-26 02:15:45 +00:00
parent 5e5aeb4684 eaddac6d26
commit addc906f70
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -13787,7 +13787,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
        }

        if ((flags & ViewGroup.FLAG_CLIP_CHILDREN) == ViewGroup.FLAG_CLIP_CHILDREN &&
-                !useDisplayListProperties && layerType == LAYER_TYPE_NONE) {
+                !useDisplayListProperties && cache == null) {
            if (offsetForScroll) {
                canvas.clipRect(sx, sy, sx + (mRight - mLeft), sy + (mBottom - mTop));
            } else {