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

Commit 97013da2 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Finish fixed rotation of recents until transition is done" into rvc-dev... 

Merge "Finish fixed rotation of recents until transition is done" into rvc-dev am: ee5df39e am: 6da6bf84 am: 00970658

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

Change-Id: Ie588befcdeb6156bf105732701116233fcc54130
parents 9ed68c0f 00970658

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

+6 −2
Original line number Diff line number Diff line
@@ -5647,8 +5647,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
            }



            if (animatingRecents != null && animatingRecents == mFixedRotationLaunchingApp) {

                // Because it won't affect display orientation, just finish the transform.

                animatingRecents.finishFixedRotationTransform();

                // The recents activity should be going to be invisible (switch to another app or

                // return to original top). Only clear the top launching record without finishing

                // the transform immediately because it won't affect display orientation. And before

                // the visibility is committed, the recents activity may perform relayout which may

                // cause unexpected configuration change if the rotated configuration is restored.

                // The transform will be finished when the transition is done.

                setFixedRotationLaunchingAppUnchecked(null);

            } else {

                // If there is already a launching activity that is not the recents, before its

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

+11 −3
Original line number Diff line number Diff line
@@ -349,11 +349,19 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
        assertEquals(Configuration.ORIENTATION_PORTRAIT,

                homeActivity.getConfiguration().orientation);



        // Home activity won't become top (return to landActivity), so its fixed rotation and the

        // top rotated record should be cleared.

        // Home activity won't become top (return to landActivity), so the top rotated record should

        // be cleared.

        mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION);

        assertFalse(homeActivity.hasFixedRotationTransform());

        assertFalse(mDefaultDisplay.isFixedRotationLaunchingApp(homeActivity));

        assertFalse(mDefaultDisplay.hasTopFixedRotationLaunchingApp());

        // The transform should keep until the transition is done, so the restored configuration

        // won't be sent to activity and cause unnecessary configuration change.

        assertTrue(homeActivity.hasFixedRotationTransform());



        // In real case the transition will be executed from RecentsAnimation#finishAnimation.

        mDefaultDisplay.mFixedRotationTransitionListener.onAppTransitionFinishedLocked(

                homeActivity.token);

        assertFalse(homeActivity.hasFixedRotationTransform());

    }



    @Test