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

Commit d3c62efd authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Allow apply animation to ActivityRecord after transfer starting... 

Merge "Allow apply animation to ActivityRecord after transfer starting window." into rvc-dev am: 3ef98ae1

Change-Id: Id7bd5e8a7f7590dff8684bc4d43a09eab404502f
parents 2d019d5f 3ef98ae1

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

+8 −6
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
    private final WindowState.UpdateReportedVisibilityResults mReportedVisibilityResults =

            new WindowState.UpdateReportedVisibilityResults();



    boolean mUseTransferredAnimation;

    private boolean mUseTransferredAnimation;



    /**

     * @see #currentLaunchCanTurnScreenOn()
@@ -3366,12 +3366,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                }

                setClientVisible(fromActivity.mClientVisible);



                if (fromActivity.isAnimating()) {

                    transferAnimation(fromActivity);



                // When transferring an animation, we no longer need to apply an animation to the

                // the token we transfer the animation over. Thus, set this flag to indicate we've

                // transferred the animation.

                    // When transferring an animation, we no longer need to apply an animation to

                    // the token we transfer the animation over. Thus, set this flag to indicate

                    // we've transferred the animation.

                    mUseTransferredAnimation = true;

                }



                mWmService.updateFocusedWindowLocked(

                        UPDATE_FOCUS_WILL_PLACE_SURFACES, true /*updateInputWindows*/);

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

+28 −0
Original line number Diff line number Diff line
@@ -31,10 +31,12 @@ import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; 
import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;

import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_STARTING;

import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;

import static android.view.WindowManager.TRANSIT_ACTIVITY_OPEN;



import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;



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

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

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;
@@ -59,6 +61,8 @@ import android.view.WindowManager; 
import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;



import com.android.server.wm.SurfaceAnimator.OnAnimationFinishedCallback;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -365,6 +369,30 @@ public class AppWindowTokenTests extends WindowTestsBase { 
        assertHasStartingWindow(activity2);

    }



    @Test

    public void testTransferStartingWindowCanAnimate() {

        final ActivityRecord activity1 = createIsolatedTestActivityRecord();

        final ActivityRecord activity2 = createIsolatedTestActivityRecord();

        activity1.addStartingWindow(mPackageName,

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

                false, false);

        waitUntilHandlersIdle();

        activity2.addStartingWindow(mPackageName,

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

                true, true, false, true, false, false);

        waitUntilHandlersIdle();

        assertNoStartingWindow(activity1);

        assertHasStartingWindow(activity2);



        // Assert that bottom activity is allowed to do animation.

        doReturn(true).when(activity2).okToAnimate();

        doReturn(true).when(activity2).isAnimating();

        final OnAnimationFinishedCallback onAnimationFinishedCallback =

                mock(OnAnimationFinishedCallback.class);

        assertTrue(activity2.applyAnimation(null, TRANSIT_ACTIVITY_OPEN, true, false,

                onAnimationFinishedCallback));

    }



    private ActivityRecord createIsolatedTestActivityRecord() {

        final ActivityStack taskStack = createTaskStackOnDisplay(mDisplayContent);

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