From 0585b227d0c021dd5726cb9a045fc3397f47185c Mon Sep 17 00:00:00 2001 From: Graciela Wissen Putri Date: Thu, 11 May 2023 10:59:28 +0000 Subject: [7/n] Camera Compat: Tooltip with shell transitions Test: Manual Fix: 266738239 Change-Id: I08ea64620a8c2612dbccd757077c137317256613 --- .../java/com/android/server/wm/DisplayRotationCompatPolicy.java | 2 +- services/core/java/com/android/server/wm/Transition.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java b/services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java index ae93a9496f7c..afa97901ffbf 100644 --- a/services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayRotationCompatPolicy.java @@ -245,7 +245,7 @@ final class DisplayRotationCompatPolicy { } /** - * Notifies that animation in {@link ScreenAnimationRotation} has finished. + * Notifies that animation in {@link ScreenRotationAnimation} has finished. * *

This class uses this signal as a trigger for notifying the user about forced rotation * reason with the {@link Toast}. diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index bfd0d96a04ab..1d45fcd412d6 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -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); -- cgit v1.2.3-59-g8ed1b