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

Commit 27c6865d 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:...

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

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

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

parents 89360146 ac1c1ca4

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

+1 −1

Original line number	Original line	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		* <p>This class uses this signal as a trigger for notifying the user about forced rotation
	* reason with the {@link Toast}.		* reason with the {@link Toast}.

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

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1194,6 +1194,13 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
	if (asyncRotationController != null && containsChangeFor(dc, mTargets)) {		if (asyncRotationController != null && containsChangeFor(dc, mTargets)) {
	asyncRotationController.onTransitionFinished();		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) {		if (mTransientLaunches != null) {
	InsetsControlTarget prevImeTarget = dc.getImeTarget(		InsetsControlTarget prevImeTarget = dc.getImeTarget(
	DisplayContent.IME_TARGET_CONTROL);		DisplayContent.IME_TARGET_CONTROL);