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

Commit 404a138e authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Freeze insets position for shell transition rotation" into tm-qpr-dev

parents 626db83c 25032134

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