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

Commit f2c5ecb1 authored Jul 01, 2022 by Riddle Hsu Committed by Automerger Merge Worker Jul 01, 2022

Merge "Freeze insets position for shell transition rotation" into tm-qpr-dev...

Merge "Freeze insets position for shell transition rotation" into tm-qpr-dev am: 404a138e am: 9d85462b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19129428

Change-Id: I645708063741247de10dee264049363734194a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents c652f395 9d85462b

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -357,7 +357,7 @@ class AsyncRotationController extends FadeAnimationController implements Consume
		* or seamless transformation in a rotated display.
		*/
		boolean shouldFreezeInsetsPosition(WindowState w) {
		return mTransitionOp == OP_APP_SWITCH && w.mTransitionController.inTransition()
		return mTransitionOp != OP_LEGACY && w.mTransitionController.inTransition()
		&& isTargetToken(w.mToken);
		}

services/tests/wmtests/src/com/android/server/wm/TransitionTests.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -686,6 +686,7 @@ public class TransitionTests extends WindowTestsBase {
		assertTrue(ime.mToken.inTransition());
		assertTrue(task.inTransition());
		assertTrue(asyncRotationController.isTargetToken(decorToken));
		assertTrue(asyncRotationController.shouldFreezeInsetsPosition(navBar));

		screenDecor.setOrientationChanging(false);
		// Status bar finishes drawing before the start transaction. Its fade-in animation will be