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

Merge "Ensure that ViewGroup.getChildVisibleRect(...) is recursive." into nyc-dev

Browse Source
This commit is contained in:
Abodunrinwa Toki
2016-05-16 09:37:54 +00:00
committed by Android (Google) Code Review
parent 9a32929def cb66406d33
commit 376f9f4bd6
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5482,6 +5482,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
} }
/** /**
* @param forceParentCheck true to guarantee that this call will propagate to all ancestors,
* false otherwise
*
* @hide * @hide
*/ */
public boolean getChildVisibleRect( public boolean getChildVisibleRect(
@@ -5541,7 +5544,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
(int) Math.ceil(rect.right), (int) Math.ceil(rect.bottom)); (int) Math.ceil(rect.right), (int) Math.ceil(rect.bottom));
if ((forceParentCheck || rectIsVisible) && mParent != null) { if ((forceParentCheck || rectIsVisible) && mParent != null) {
rectIsVisible = mParent.getChildVisibleRect(this, r, offset); if (mParent instanceof ViewGroup) {
rectIsVisible = ((ViewGroup) mParent)
.getChildVisibleRect(this, r, offset, forceParentCheck);
} else {
rectIsVisible = mParent.getChildVisibleRect(this, r, offset);
}
} }
return rectIsVisible; return rectIsVisible;
} }