Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I8bb919244f808aca00a2e2c8af9fb2658252460b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Graciela Putri
2023-05-12 09:14:02 +00:00
committed by Automerger Merge Worker
parent e427b5cba0 642068a9d5
commit d00b288c52
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java
View File

@@ -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}.

7
services/core/java/com/android/server/wm/Transition.java
View File

@@ -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);