Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev

2014-12-12 18:37:31 +00:00
parent a47f968d7e 35da41e6c3
commit 9a0799cf6b
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/view/ViewGroup.java
+++ b/core/java/android/view/ViewGroup.java
@@ -5113,7 +5113,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
        final int height = mBottom - mTop;

        boolean rectIsVisible = true;
-        if (mParent instanceof ViewGroup && ((ViewGroup)mParent).getClipChildren()) {
+        if (mParent == null ||
+                (mParent instanceof ViewGroup && ((ViewGroup) mParent).getClipChildren())) {
            // Clip to bounds.
            rectIsVisible = rect.intersect(0, 0, width, height);
        }