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

Commit 4c0e55d0 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Don't get struct of children of !laidout viewGroup" into oc-mr1-dev

parents 341cd735 083d8aac

core/java/android/view/View.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -8078,10 +8078,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            boolean forAutofill, @AutofillFlags int flags) {

            boolean forAutofill, @AutofillFlags int flags) {

        if (forAutofill) {

        if (forAutofill) {

            structure.setAutofillId(getAutofillId());

            structure.setAutofillId(getAutofillId());

            if (!isLaidOut()) {

                Log.w(VIEW_LOG_TAG, "dispatchProvideAutofillStructure(): not laid out, ignoring");

                return;

            }

            onProvideAutofillStructure(structure, flags);

            onProvideAutofillStructure(structure, flags);

            onProvideAutofillVirtualStructure(structure, flags);

            onProvideAutofillVirtualStructure(structure, flags);

        } else if (!isAssistBlocked()) {

        } else if (!isAssistBlocked()) {

core/java/android/view/ViewGroup.java

+14 −0
Original line number Original line Diff line number Diff line
@@ -3400,6 +3400,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        if (childrenCount <= 0) {

        if (childrenCount <= 0) {

            return;

            return;

        }

        }



        if (!isLaidOut()) {

            Log.v(VIEW_LOG_TAG, "dispatchProvideStructure(): not laid out, ignoring "

                    + childrenCount + " children of " + getAccessibilityViewId());

            return;

        }



        structure.setChildCount(childrenCount);

        structure.setChildCount(childrenCount);

        ArrayList<View> preorderedList = buildOrderedChildList();

        ArrayList<View> preorderedList = buildOrderedChildList();

        boolean customOrder = preorderedList == null

        boolean customOrder = preorderedList == null
@@ -3476,6 +3483,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
        if (structure.getChildCount() != 0) {

        if (structure.getChildCount() != 0) {

            return;

            return;

        }

        }



        if (!isLaidOut()) {

            Log.v(VIEW_LOG_TAG, "dispatchProvideAutofillStructure(): not laid out, ignoring "

                    + mChildrenCount + " children of " + getAutofillId());

            return;

        }



        final ChildListForAutoFill children = getChildrenForAutofill(flags);

        final ChildListForAutoFill children = getChildrenForAutofill(flags);

        final int childrenCount = children.size();

        final int childrenCount = children.size();

        structure.setChildCount(childrenCount);

        structure.setChildCount(childrenCount);