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

Commit 9d85462b authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Freeze insets position for shell transition rotation" into tm-qpr-dev am: 404a138e 

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



Change-Id: Ia6489f0c02f3c1cf2f28a960715a1a8224be5613
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cdfc1e6f 404a138e

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

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ class AsyncRotationController extends FadeAnimationController implements Consume 
     * or seamless transformation in a rotated display.

     */

    boolean shouldFreezeInsetsPosition(WindowState w) {

        return mTransitionOp == OP_APP_SWITCH && w.mTransitionController.inTransition()

        return mTransitionOp != OP_LEGACY && w.mTransitionController.inTransition()

                && isTargetToken(w.mToken);

    }

services/tests/wmtests/src/com/android/server/wm/TransitionTests.java

+1 −0
Original line number Diff line number Diff line
@@ -683,6 +683,7 @@ public class TransitionTests extends WindowTestsBase { 
        assertTrue(ime.mToken.inTransition());

        assertTrue(task.inTransition());

        assertTrue(asyncRotationController.isTargetToken(decorToken));

        assertTrue(asyncRotationController.shouldFreezeInsetsPosition(navBar));



        screenDecor.setOrientationChanging(false);

        // Status bar finishes drawing before the start transaction. Its fade-in animation will be