From fc00db0af3504552e6069dd534234e53225e0e47 Mon Sep 17 00:00:00 2001 From: Daniel Kim Date: Fri, 3 Nov 2023 22:03:06 +0000 Subject: Revert "Include invisible parent layouts in assistStructure" Revert submission 24735159-invisible_layout Reason for revert: possible regression in AwG truth data processor. Will re-raise under a flag Reverted changes: /q/submissionid:24735159-invisible_layout Change-Id: I651d687835754ba3b8a0dfd488831b044f8a9f8b --- core/java/android/view/ViewGroup.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 1ef6ab796e0c..85d7c10ef91e 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3752,15 +3752,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager && !child.isActivityDeniedForAutofillForUnimportantView()) || (shouldIncludeAllChildrenViewWithAutofillTypeNotNone(afm) && child.getAutofillType() != AUTOFILL_TYPE_NONE) - || shouldIncludeAllChildrenViews(afm) - || (child instanceof ViewGroup && child.getVisibility() != View.VISIBLE)) { - // If the child is a ViewGroup object and its visibility is not visible, include - // it as part of the assist structure. The children of these invisible ViewGroup - // objects are parsed and included in the assist structure. When the Autofill - // Provider determines the visibility of these children, it looks at their - // visibility as well as their parent's visibility. Omitting invisible parents - // will lead to the Autofill Provider incorrectly assuming that these children - // of invisible parents are actually visible. + || shouldIncludeAllChildrenViews(afm)){ list.add(child); } else if (child instanceof ViewGroup) { ((ViewGroup) child).populateChildrenForAutofill(list, flags); -- cgit v1.2.3-59-g8ed1b