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

Commit 273225a6 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Skip transition only when transferring starting from visible activity"... 

Merge "Skip transition only when transferring starting from visible activity" into sc-v2-dev am: a790ce39

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

Change-Id: Ibc66e8aa57fca9ada74a208128aeff903fbda55a
parents 7a885d18 a790ce39

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

+3 −1
Original line number Diff line number Diff line
@@ -3935,7 +3935,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        if (tStartingWindow != null && fromActivity.mStartingSurface != null) {

            // In this case, the starting icon has already been displayed, so start

            // letting windows get shown immediately without any more transitions.

            getDisplayContent().mSkipAppTransitionAnimation = true;

            if (fromActivity.mVisible) {

                mDisplayContent.mSkipAppTransitionAnimation = true;

            }



            ProtoLog.v(WM_DEBUG_STARTING_WINDOW, "Moving existing starting %s"

                    + " from %s to %s", tStartingWindow, fromActivity, this);

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

+6 −2
Original line number Diff line number Diff line
@@ -2510,8 +2510,10 @@ public class ActivityRecordTests extends WindowTestsBase { 
    @Test

    public void testTransferStartingWindow() {

        registerTestStartingWindowOrganizer();

        final ActivityRecord activity1 = new ActivityBuilder(mAtm).setCreateTask(true).build();

        final ActivityRecord activity2 = new ActivityBuilder(mAtm).setCreateTask(true).build();

        final ActivityRecord activity1 = new ActivityBuilder(mAtm).setCreateTask(true)

                .setVisible(false).build();

        final ActivityRecord activity2 = new ActivityBuilder(mAtm).setCreateTask(true)

                .setVisible(false).build();

        activity1.addStartingWindow(mPackageName,

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

                false, false);
@@ -2520,6 +2522,7 @@ public class ActivityRecordTests extends WindowTestsBase { 
                android.R.style.Theme, null, "Test", 0, 0, 0, 0, activity1,

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

        waitUntilHandlersIdle();

        assertFalse(mDisplayContent.mSkipAppTransitionAnimation);

        assertNoStartingWindow(activity1);

        assertHasStartingWindow(activity2);

    }
@@ -2627,6 +2630,7 @@ public class ActivityRecordTests extends WindowTestsBase { 
                false /* newTask */, false /* isTaskSwitch */, null /* options */,

                null /* sourceRecord */);



        assertTrue(mDisplayContent.mSkipAppTransitionAnimation);

        assertNull(middle.mStartingWindow);

        assertHasStartingWindow(top);

        assertTrue(top.isVisible());