Merge "Revert "Use activities' own animations, unless opaque activity on top"" into main (0bf811b2) · Commits · e / os / android_frameworks_base

core/java/android/window/flags/windowing_frontend.aconfig

+1 −10

Original line number	Diff line number	Diff line
		@@ -245,15 +245,6 @@ flag {
		}
		}

		flag {
		name: "custom_animations_behind_translucent"
		namespace: "windowing_frontend"
		description: "A change can use its own layer parameters to animate behind a translucent activity"
		bug: "327332488"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}
		flag {
		name: "migrate_predictive_back_transition"
		namespace: "windowing_frontend"

services/core/java/com/android/server/wm/Transition.java

+26 −58

Original line number	Diff line number	Diff line
		@@ -2875,19 +2875,12 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		return out;
		}

		// Get the animation theme from the top-most application window
		// when Flags.customAnimationsBehindTranslucent() is false.
		final AnimationOptions animOptionsForActivityTransition =
		calculateAnimationOptionsForActivityTransition(type, sortedTargets);

		if (!Flags.moveAnimationOptionsToChange() && animOptionsForActivityTransition != null) {
		out.setAnimationOptions(animOptionsForActivityTransition);
		}

		// Store the animation options of the topmost non-translucent change
		// (Used when Flags.customAnimationsBehindTranslucent() is true)
		AnimationOptions activityAboveAnimationOptions = null;

		final ArraySet<WindowContainer> occludedAtEndContainers = new ArraySet<>();
		// Convert all the resolved ChangeInfos into TransactionInfo.Change objects in order.
		final int count = sortedTargets.size();
		@@ -3006,26 +2999,9 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		change.setBackgroundColor(ColorUtils.setAlphaComponent(backgroundColor, 255));
		}

		// Calculate the animation options for this change
		if (Flags.moveAnimationOptionsToChange()) {
		AnimationOptions animOptions = null;
		if (Flags.customAnimationsBehindTranslucent() && activityRecord != null) {
		if (activityAboveAnimationOptions != null) {
		// Inherit the options from one of the changes on top of this
		animOptions = activityAboveAnimationOptions;
		} else {
		// Create the options based on this change's custom animations and layout
		// parameters
		animOptions = getOptions(activityRecord /* customAnimActivity */,
		activityRecord /* animLpActivity */);
		if (!change.hasFlags(FLAG_TRANSLUCENT)) {
		// If this change is not translucent, its options are going to be
		// inherited by the changes below
		activityAboveAnimationOptions = animOptions;
		}
		}
		} else if (activityRecord != null && animOptionsForActivityTransition != null) {
		// Use the same options from the top activity for all the activities
		if (Flags.moveAnimationOptionsToChange()) {
		if (activityRecord != null && animOptionsForActivityTransition != null) {
		animOptions = animOptionsForActivityTransition;
		} else if (Flags.activityEmbeddingOverlayPresentationFlag()
		&& isEmbeddedTaskFragment) {
		@@ -3074,42 +3050,28 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		@Nullable
		private static AnimationOptions calculateAnimationOptionsForActivityTransition(
		@TransitionType int type, @NonNull ArrayList<ChangeInfo> sortedTargets) {
		TransitionInfo.AnimationOptions animOptions = null;

		// Check if the top-most app is an activity (ie. activity->activity). If so, make sure
		// to honor its custom transition options.
		WindowContainer<?> topApp = null;
		for (int i = 0; i < sortedTargets.size(); i++) {
		if (!isWallpaper(sortedTargets.get(i).mContainer)) {
		if (isWallpaper(sortedTargets.get(i).mContainer)) continue;
		topApp = sortedTargets.get(i).mContainer;
		break;
		}
		}
		ActivityRecord animLpActivity = findAnimLayoutParamsActivityRecord(type, sortedTargets);
		return getOptions(topApp.asActivityRecord() /* customAnimActivity */,
		animLpActivity /* animLpActivity */);
		}

		/**
		* Updates and returns animOptions with the layout parameters of animLpActivity
		* @param customAnimActivity the activity that drives the custom animation options
		* @param animLpActivity the activity that drives the animation options with its layout
		* parameters
		* @return the options extracted from the provided activities
		*/
		@Nullable
		private static AnimationOptions getOptions(@Nullable ActivityRecord customAnimActivity,
		@Nullable ActivityRecord animLpActivity) {
		AnimationOptions animOptions = null;
		// Custom
		if (customAnimActivity != null) {
		animOptions = addCustomActivityTransition(customAnimActivity, true /* open */,
		animOptions);
		animOptions = addCustomActivityTransition(customAnimActivity, false /* open */,
		if (topApp.asActivityRecord() != null) {
		final ActivityRecord topActivity = topApp.asActivityRecord();
		animOptions = addCustomActivityTransition(topActivity, true/* open */,
		null /* animOptions */);
		animOptions = addCustomActivityTransition(topActivity, false/* open */,
		animOptions);
		}

		// Layout parameters
		final ActivityRecord animLpActivity =
		findAnimLayoutParamsActivityRecord(type, sortedTargets);
		final WindowState mainWindow = animLpActivity != null
		? animLpActivity.findMainWindow() : null;
		final WindowManager.LayoutParams animLp = mainWindow != null ? mainWindow.mAttrs : null;

		WindowManager.LayoutParams animLp = mainWindow != null ? mainWindow.mAttrs : null;
		if (animLp != null && animLp.type != TYPE_APPLICATION_STARTING
		&& animLp.windowAnimations != 0) {
		// Don't send animation options if no windowAnimations have been set or if the we
		@@ -3249,9 +3211,10 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		return ancestor;
		}

		@Nullable
		private static ActivityRecord findAnimLayoutParamsActivityRecord(
		@TransitionType int transit, @NonNull List<ChangeInfo> sortedTargets) {
		private static ActivityRecord findAnimLayoutParamsActivityRecord(int type,
		ArrayList<ChangeInfo> sortedTargets) {
		// Find the layout params of the top-most application window that is part of the
		// transition, which is what will control the animation theme.
		final ArraySet<Integer> activityTypes = new ArraySet<>();
		final int targetCount = sortedTargets.size();
		for (int i = 0; i < targetCount; ++i) {
		@@ -3271,7 +3234,12 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		// activity through the layout parameter animation style.
		return null;
		}
		return findAnimLayoutParamsActivityRecord(sortedTargets, type, activityTypes);
		}

		private static ActivityRecord findAnimLayoutParamsActivityRecord(
		List<ChangeInfo> sortedTargets,
		@TransitionType int transit, ArraySet<Integer> activityTypes) {
		// Remote animations always win, but fullscreen windows override non-fullscreen windows.
		ActivityRecord result = lookForTopWindowWithFilter(sortedTargets,
		w -> w.getRemoteAnimationDefinition() != null