Merge "Revert "Set view bounds in parent by diff'ing the bounds in scre..."" into main (1c434c08) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+4 −41

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import static android.view.displayhash.DisplayHashResultCallback.EXTRA_DISPLAY_H
		import static android.view.flags.Flags.FLAG_SENSITIVE_CONTENT_APP_PROTECTION_API;
		import static android.view.flags.Flags.FLAG_TOOLKIT_SET_FRAME_RATE_READ_ONLY;
		import static android.view.flags.Flags.FLAG_VIEW_VELOCITY_API;
		import static android.view.flags.Flags.calculateBoundsInParentFromBoundsInScreen;
		import static android.view.flags.Flags.enableUseMeasureCacheDuringForceLayout;
		import static android.view.flags.Flags.sensitiveContentAppProtection;
		import static android.view.flags.Flags.toolkitFrameRateAnimationBugfix25q1;
		@@ -967,13 +966,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		*/
		private static boolean sAlwaysRemeasureExactly = false;

		/**
		* When true calculates the bounds in parent from bounds in screen relative to its parents.
		* This addresses the deprecated API (setBoundsInParent) in Compose, which causes empty
		* getBoundsInParent call for Compose apps.
		*/
		private static boolean sCalculateBoundsInParentFromBoundsInScreenFlagValue = false;

		/**
		* When true makes it possible to use onMeasure caches also when the force layout flag is
		* enabled. This helps avoiding multiple measures in the same frame with the same dimensions.
		@@ -2564,8 +2556,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		sToolkitSetFrameRateReadOnlyFlagValue = toolkitSetFrameRateReadOnly();
		sToolkitMetricsForFrameRateDecisionFlagValue = toolkitMetricsForFrameRateDecision();
		sCalculateBoundsInParentFromBoundsInScreenFlagValue =
		calculateBoundsInParentFromBoundsInScreen();
		sUseMeasureCacheDuringForceLayoutFlagValue = enableUseMeasureCacheDuringForceLayout();
		}

		@@ -9786,7 +9776,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		structure.setChildCount(1);
		final ViewStructure root = structure.newChild(0);
		if (info != null) {
		populateVirtualStructure(root, provider, info, null, forAutofill);
		populateVirtualStructure(root, provider, info, forAutofill);
		info.recycle();
		} else {
		Log.w(AUTOFILL_LOG_TAG, "AccessibilityNodeInfo is null.");
		@@ -11085,19 +11075,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		private void populateVirtualStructure(ViewStructure structure,
		AccessibilityNodeProvider provider, AccessibilityNodeInfo info,
		@Nullable AccessibilityNodeInfo parentInfo, boolean forAutofill) {
		boolean forAutofill) {
		structure.setId(AccessibilityNodeInfo.getVirtualDescendantId(info.getSourceNodeId()),
		null, null, info.getViewIdResourceName());
		Rect rect = structure.getTempRect();
		// The bounds in parent for Jetpack Compose views aren't set as setBoundsInParent is
		// deprecated, and only setBoundsInScreen is called.
		// The bounds in parent can be calculated by diff'ing the child view's bounds in screen with
		// the parent's.
		if (sCalculateBoundsInParentFromBoundsInScreenFlagValue) {
		getBoundsInParent(info, parentInfo, rect);
		} else {
		info.getBoundsInParent(rect);
		}
		structure.setDimens(rect.left, rect.top, 0, 0, rect.width(), rect.height());
		structure.setVisibility(VISIBLE);
		structure.setEnabled(info.isEnabled());
		@@ -11181,32 +11163,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		AccessibilityNodeInfo.getVirtualDescendantId(info.getChildId(i)));
		if (cinfo != null) {
		ViewStructure child = structure.newChild(i);
		populateVirtualStructure(child, provider, cinfo, info, forAutofill);
		populateVirtualStructure(child, provider, cinfo, forAutofill);
		cinfo.recycle();
		}
		}
		}
		}

		private void getBoundsInParent(@NonNull AccessibilityNodeInfo info,
		@Nullable AccessibilityNodeInfo parentInfo, @NonNull Rect rect) {
		info.getBoundsInParent(rect);
		// Fallback to calculate bounds in parent by diffing the bounds in
		// screen if it's all 0.
		if ((rect.left \| rect.top \| rect.right \| rect.bottom) == 0) {
		if (parentInfo != null) {
		Rect parentBoundsInScreen = parentInfo.getBoundsInScreen();
		Rect boundsInScreen = info.getBoundsInScreen();
		rect.set(boundsInScreen.left - parentBoundsInScreen.left,
		boundsInScreen.top - parentBoundsInScreen.top,
		boundsInScreen.right - parentBoundsInScreen.left,
		boundsInScreen.bottom - parentBoundsInScreen.top);
		} else {
		info.getBoundsInScreen(rect);
		}
		}
		}

		/**
		* Dispatch creation of {@link ViewStructure} down the hierarchy. The default
		* implementation calls {@link #onProvideStructure} and