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

Commit bc9311b5 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Wait for all of associated activities done animating" into... 

Merge "Merge "Wait for all of associated activities done animating" into rvc-dev am: e873ed32 am: 7904f5a6 am: 53ab7d5a" into rvc-qpr-dev-plus-aosp am: 9ed68c0f

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

Change-Id: I37205d7dce4385419b6f6d19eb142d6320f03a9e
parents b9e1b80d 9ed68c0f

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

+7 −0
Original line number Diff line number Diff line
@@ -3358,6 +3358,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


            final long origId = Binder.clearCallingIdentity();

            try {

                // Link the fixed rotation transform to this activity since we are transferring the

                // starting window.

                if (fromActivity.hasFixedRotationTransform()) {

                    mDisplayContent.handleTopActivityLaunchingInDifferentOrientation(this,

                            false /* checkOpening */);

                }



                // Transfer the starting window over to the new token.

                mStartingData = fromActivity.mStartingData;

                startingSurface = fromActivity.startingSurface;

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

+5 −1
Original line number Diff line number Diff line
@@ -5495,7 +5495,11 @@ class DisplayContent extends DisplayArea.Root implements WindowManagerPolicy.Dis 
            }

            if (mFixedRotationLaunchingApp != null

                    && mFixedRotationLaunchingApp.hasFixedRotationTransform(r)) {

                // Waiting until all of the associated activities have done animation, or the

                // orientation would be updated too early and cause flickers.

                if (!mFixedRotationLaunchingApp.hasAnimatingFixedRotationTransition()) {

                    continueUpdateOrientationForDiffOrienLaunchingApp();

                }

            } else {

                r.finishFixedRotationTransform();

            }

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

+19 −0
Original line number Diff line number Diff line
@@ -554,6 +554,25 @@ class WindowToken extends WindowContainer<WindowState> { 
        notifyFixedRotationTransform(true /* enabled */);

    }



    /**

     * Return {@code true} if one of the associated activity is still animating. Otherwise,

     * return {@code false}.

     */

    boolean hasAnimatingFixedRotationTransition() {

        if (mFixedRotationTransformState == null) {

            return false;

        }



        for (int i = mFixedRotationTransformState.mAssociatedTokens.size() - 1; i >= 0; i--) {

            final ActivityRecord r =

                    mFixedRotationTransformState.mAssociatedTokens.get(i).asActivityRecord();

            if (r != null && r.isAnimating(TRANSITION | PARENTS)) {

                return true;

            }

        }

        return false;

    }



    void finishFixedRotationTransform() {

        finishFixedRotationTransform(null /* applyDisplayRotation */);

    }

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

+27 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentat 


import static com.android.dx.mockito.inline.extended.ExtendedMockito.doCallRealMethod;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.server.wm.WindowContainer.POSITION_TOP;

import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_AFTER_ANIM;

import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_BEFORE_ANIM;

import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_NONE;
@@ -452,6 +453,32 @@ public class AppWindowTokenTests extends WindowTestsBase { 
        assertFalse(middle.isVisible());

    }



    @Test

    public void testTransferStartingWindowSetFixedRotation() {

        mWm.mIsFixedRotationTransformEnabled = true;

        final ActivityRecord topActivity = createTestActivityRecordForGivenTask(mTask);

        mTask.positionChildAt(topActivity, POSITION_TOP);

        mActivity.addStartingWindow(mPackageName,

                android.R.style.Theme, null, "Test", 0, 0, 0, 0, null, true, true, false, true,

                false);

        waitUntilHandlersIdle();



        // Make activities to have different rotation from it display and set fixed rotation

        // transform to activity1.

        int rotation = (mDisplayContent.getRotation() + 1) % 4;

        mDisplayContent.setFixedRotationLaunchingApp(mActivity, rotation);

        doReturn(rotation).when(mDisplayContent)

                .rotationForActivityInDifferentOrientation(topActivity);



        // Make sure the fixed rotation transform linked to activity2 when adding starting window

        // on activity2.

        topActivity.addStartingWindow(mPackageName,

                android.R.style.Theme, null, "Test", 0, 0, 0, 0, mActivity.appToken.asBinder(),

                false, false, false, true, false);

        waitUntilHandlersIdle();

        assertTrue(topActivity.hasFixedRotationTransform());

    }



    private ActivityRecord createIsolatedTestActivityRecord() {

        final ActivityStack taskStack = createTaskStackOnDisplay(mDisplayContent);

        final Task task = createTaskInStack(taskStack, 0 /* userId */);

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

+7 −0
Original line number Diff line number Diff line
@@ -1144,7 +1144,14 @@ public class DisplayContentTests extends WindowTestsBase { 
        assertTrue(app.hasFixedRotationTransform(app2));

        assertTrue(mDisplayContent.isFixedRotationLaunchingApp(app2));



        // The fixed rotation transform can only be finished when all animation finished.

        doReturn(false).when(app2).isAnimating(anyInt(), anyInt());

        mDisplayContent.mAppTransition.notifyAppTransitionFinishedLocked(app2.token);

        assertTrue(app.hasFixedRotationTransform());

        assertTrue(app2.hasFixedRotationTransform());



        // The display should be rotated after the launch is finished.

        doReturn(false).when(app).isAnimating(anyInt(), anyInt());

        mDisplayContent.mAppTransition.notifyAppTransitionFinishedLocked(app.token);



        // The fixed rotation should be cleared and the new rotation is applied to display.