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

Merge "Clear preordered list in translateBoundsAndIntersectionsInWindowCoordinates" into lmp-mr1-dev

Browse Source
This commit is contained in:
Chris Craik
2014-10-02 20:02:30 +00:00
committed by Android (Google) Code Review
parent 59e129fbc8 57c79c8a49
commit 438fe5937f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -864,6 +864,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
if (siblingBounds.intersect(bounds)) { if (siblingBounds.intersect(bounds)) {
// If an interactive sibling completely covers the child, done. // If an interactive sibling completely covers the child, done.
if (siblingBounds.equals(bounds)) { if (siblingBounds.equals(bounds)) {
if (orderedList != null) orderedList.clear();
return false; return false;
} }
// Keep track of the intersection rectangle. // Keep track of the intersection rectangle.
@@ -871,6 +872,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
intersections.add(intersection); intersections.add(intersection);
} }
} }
if (orderedList != null) orderedList.clear();
if (mParent instanceof ViewGroup) { if (mParent instanceof ViewGroup) {
ViewGroup parentGroup = (ViewGroup) mParent; ViewGroup parentGroup = (ViewGroup) mParent;
@@ -3293,7 +3295,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
/** /**
* Populates (and returns) mPreSortedChildren with a pre-ordered list of the View's children, * Populates (and returns) mPreSortedChildren with a pre-ordered list of the View's children,
* sorted first by Z, then by child drawing order (if applicable). * sorted first by Z, then by child drawing order (if applicable). This list must be cleared
* after use to avoid leaking child Views.
* *
* Uses a stable, insertion sort which is commonly O(n) for ViewGroups with very few elevated * Uses a stable, insertion sort which is commonly O(n) for ViewGroups with very few elevated
* children. * children.