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

Commit 8b090f6c authored May 12, 2023 by Graciela Putri Committed by Automerger Merge Worker May 12, 2023

Merge "[7/n] Camera Compat: Tooltip with shell transitions" into udc-dev am: 642068a9

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

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

parents 2c20bc82 642068a9

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -245,7 +245,7 @@ final class DisplayRotationCompatPolicy {
		}

		/**
		* Notifies that animation in {@link ScreenAnimationRotation} has finished.
		* Notifies that animation in {@link ScreenRotationAnimation} has finished.
		*
		* <p>This class uses this signal as a trigger for notifying the user about forced rotation
		* reason with the {@link Toast}.

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -1194,6 +1194,13 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		if (asyncRotationController != null && containsChangeFor(dc, mTargets)) {
		asyncRotationController.onTransitionFinished();
		}
		if (hasParticipatedDisplay && dc.mDisplayRotationCompatPolicy != null) {
		final ChangeInfo changeInfo = mChanges.get(dc);
		if (changeInfo != null
		&& changeInfo.mRotation != dc.getWindowConfiguration().getRotation()) {
		dc.mDisplayRotationCompatPolicy.onScreenRotationAnimationFinished();
		}
		}
		if (mTransientLaunches != null) {
		InsetsControlTarget prevImeTarget = dc.getImeTarget(
		DisplayContent.IME_TARGET_CONTROL);