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 am: 376f9f4bd6

Browse Source 
am: 03e7feeba3

* commit '03e7feeba33b565dd09cb77834caa643b6dff0e9':
  Ensure that ViewGroup.getChildVisibleRect(...) is recursive.

Change-Id: If5557d0a968e263b4252566566621b522ffb5617
This commit is contained in:
Abodunrinwa Toki
2016-05-16 09:47:03 +00:00
committed by android-build-merger
parent 7ba17feb32 03e7feeba3
commit 58056cf0bc
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
*/
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));
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;
}