Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Powell
2014-12-12 18:37:31 +00:00
committed by Gerrit Code Review
parent a47f968d7e 35da41e6c3
commit 9a0799cf6b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/ViewGroup.java
View File

@@ -5113,7 +5113,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
final int height = mBottom - mTop; final int height = mBottom - mTop;
boolean rectIsVisible = true; boolean rectIsVisible = true;
if (mParent instanceof ViewGroup && ((ViewGroup)mParent).getClipChildren()) { if (mParent == null ||
(mParent instanceof ViewGroup && ((ViewGroup) mParent).getClipChildren())) {
// Clip to bounds. // Clip to bounds.
rectIsVisible = rect.intersect(0, 0, width, height); rectIsVisible = rect.intersect(0, 0, width, height);
} }