Merge "Fix snapshot starting window isn't apply fixed-rotation with IME visible" into tm-dev am: c2a6a2efeb am: ca54ba46eb

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

Change-Id: I9cdb51c4eee76faca8430143257111fef51adb4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ming-Shin Lu
2022-05-30 13:34:58 +00:00
committed by Automerger Merge Worker

View File

@@ -159,9 +159,7 @@ public class StartingSurfaceController {
return null;
}
if (topFullscreenActivity.getWindowConfiguration().getRotation()
!= taskSnapshot.getRotation()
// Use normal rotation to avoid flickering of IME window in old orientation.
&& !taskSnapshot.hasImeSurface()) {
!= taskSnapshot.getRotation()) {
// The snapshot should have been checked by ActivityRecord#isSnapshotCompatible
// that the activity will be updated to the same rotation as the snapshot. Since
// the transition is not started yet, fixed rotation transform needs to be applied