diff options
| author | Adam Powell <adamp@google.com> | 2014-12-12 18:43:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-12 18:43:38 +0000 |
| commit | 746079e2ee516d1c7be62154992eda78e9f2ec28 (patch) | |
| tree | a58c7c4f2b3ab9ebbce0fedcb9b5d3f94d777e9b | |
| parent | f8dd5f6a19791fdb6fbe1fc40863c1e8dcf785e6 (diff) | |
| parent | 9a0799cf6b7289b8127ffcb22291f5baf21b4035 (diff) | |
| download | frameworks_base-746079e2ee516d1c7be62154992eda78e9f2ec28.zip frameworks_base-746079e2ee516d1c7be62154992eda78e9f2ec28.tar.gz frameworks_base-746079e2ee516d1c7be62154992eda78e9f2ec28.tar.bz2 | |
am 9a0799cf: Merge "Have ViewGroups without a parent clip child visible rects to bounds" into lmp-mr1-dev
* commit '9a0799cf6b7289b8127ffcb22291f5baf21b4035':
Have ViewGroups without a parent clip child visible rects to bounds
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 25a70eb..391f608 100644 --- 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); } |