Merge "Don't get struct of children of !laidout viewGroup" into oc-mr1-dev (a6338b9d) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -8078,10 +8078,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		boolean forAutofill, @AutofillFlags int flags) {
		if (forAutofill) {
		structure.setAutofillId(getAutofillId());
		if (!isLaidOut()) {
		Log.w(VIEW_LOG_TAG, "dispatchProvideAutofillStructure(): not laid out, ignoring");
		return;
		}
		onProvideAutofillStructure(structure, flags);
		onProvideAutofillVirtualStructure(structure, flags);
		} else if (!isAssistBlocked()) {

+14 −0

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

		if (!isLaidOut()) {
		Log.v(VIEW_LOG_TAG, "dispatchProvideStructure(): not laid out, ignoring "
		+ childrenCount + " children of " + getAccessibilityViewId());
		return;
		}

		structure.setChildCount(childrenCount);
		ArrayList<View> preorderedList = buildOrderedChildList();
		boolean customOrder = preorderedList == null
		@@ -3476,6 +3483,13 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		if (structure.getChildCount() != 0) {
		return;
		}

		if (!isLaidOut()) {
		Log.v(VIEW_LOG_TAG, "dispatchProvideAutofillStructure(): not laid out, ignoring "
		+ mChildrenCount + " children of " + getAutofillId());
		return;
		}

		final ChildListForAutoFill children = getChildrenForAutofill(flags);
		final int childrenCount = children.size();
		structure.setChildCount(childrenCount);