Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9146d7d3 authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "findViewWithText inconsistent with other findView* methods and... 

Merge "findViewWithText inconsistent with other findView* methods and AccessibilityNodeInfo not respecting root namespace."
parents 523a1289 effe10fd

core/java/android/view/ViewGroup.java

+4 −1
Original line number Diff line number Diff line
@@ -788,7 +788,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        final View[] children = mChildren;

        for (int i = 0; i < childrenCount; i++) {

            View child = children[i];

            if ((child.mViewFlags & VISIBILITY_MASK) == VISIBLE) {

            if ((child.mPrivateFlags & IS_ROOT_NAMESPACE) == 0) {

                child.findViewsWithText(outViews, text);

            }

        }
@@ -2162,6 +2162,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
    @Override

    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);

        if ((mPrivateFlags & IS_ROOT_NAMESPACE) != 0) {

            return;

        }

        for (int i = 0, count = mChildrenCount; i < count; i++) {

            View child = mChildren[i];

            if ((child.mViewFlags & VISIBILITY_MASK) == VISIBLE) {