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

Commit a2a4d00d authored Nov 27, 2024 by Wei Sheng Shih Committed by Android (Google) Code Review Nov 27, 2024

Merge "Allows the system window to be shown during the PB animation..." into main

parents 4e46533a d3414b06

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -653,7 +653,9 @@ class AsyncRotationController extends FadeAnimationController implements Consume
		// by drawing the rotated content before applying projection transaction of display.
		// And it will fade in after the display transition is finished.
		if (mTransitionOp == OP_APP_SWITCH && !mIsStartTransactionCommitted
		&& canBeAsync(w.mToken) && !mDisplayContent.hasFixedRotationTransientLaunch()) {
		&& canBeAsync(w.mToken) && !mDisplayContent.hasFixedRotationTransientLaunch()
		&& !mService.mAtmService.mBackNavigationController.hasFixedRotationAnimation(
		mDisplayContent)) {
		hideImmediately(w.mToken, Operation.ACTION_FADE);
		if (DEBUG) Slog.d(TAG, "Hide on finishDrawing " + w.mToken.getTopChild());
		}

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -622,6 +622,15 @@ class BackNavigationController {
		}
		}

		boolean hasFixedRotationAnimation(@NonNull DisplayContent displayContent) {
		if (!mAnimationHandler.mComposed) {
		return false;
		}
		final ActivityRecord openActivity = mAnimationHandler.mOpenActivities[0];
		return displayContent == openActivity.mDisplayContent
		&& displayContent.isFixedRotationLaunchingApp(openActivity);
		}

		private boolean isWaitBackTransition() {
		// Ignore mWaitTransition while flag is enabled.
		return mAnimationHandler.mComposed && (Flags.migratePredictiveBackTransition()