Merge "Do not hide new adding window for rotated transient launch" into main (3b95fbb8) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -642,7 +642,7 @@ 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)) {
		&& canBeAsync(w.mToken) && !mDisplayContent.hasFixedRotationTransientLaunch()) {
		hideImmediately(w.mToken, Operation.ACTION_FADE);
		if (DEBUG) Slog.d(TAG, "Hide on finishDrawing " + w.mToken.getTopChild());
		}

+8 −3

Original line number	Diff line number	Diff line
		@@ -1950,6 +1950,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		&& mFixedRotationLaunchingApp != mFixedRotationTransitionListener.mAnimatingRecents;
		}

		/** It usually means whether the recents activity is launching with a different rotation. */
		boolean hasFixedRotationTransientLaunch() {
		return mFixedRotationLaunchingApp != null
		&& mTransitionController.isTransientLaunch(mFixedRotationLaunchingApp);
		}

		boolean isFixedRotationLaunchingApp(ActivityRecord r) {
		return mFixedRotationLaunchingApp == r;
		}
		@@ -7013,9 +7019,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		boolean shouldDeferRotation() {
		ActivityRecord source = null;
		if (mTransitionController.isShellTransitionsEnabled()) {
		final ActivityRecord r = mFixedRotationLaunchingApp;
		if (r != null && mTransitionController.isTransientLaunch(r)) {
		source = r;
		if (hasFixedRotationTransientLaunch()) {
		source = mFixedRotationLaunchingApp;
		}
		} else if (mAnimatingRecents != null && !hasTopFixedRotationLaunchingApp()) {
		source = mAnimatingRecents;