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

Commit c5cc396e authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

Merge "Fix snapshot starting window isn't apply fixed-rotation with IME... 

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

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



Change-Id: I8b2760cc431bf1ec85533f4a3eb6a20ca7e68ada
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26950347 63ff950b

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

+1 −3
Original line number Diff line number Diff line
@@ -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