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

Commit a4dd98f1 authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge "Avoid applying closing animation for invisible activity." into sc-dev am: fc3491bd 

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

Change-Id: Ib0a241a5734b385d91eb33ee049ff3f4a7f5534c
parents bfcb789c fc3491bd

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

+1 −1
Original line number Diff line number Diff line
@@ -4593,7 +4593,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            if (visible) {

                displayContent.mOpeningApps.add(this);

                mEnteringAnimation = true;

            } else {

            } else if (mVisible) {

                displayContent.mClosingApps.add(this);

                mEnteringAnimation = false;

            }

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

+79 −0
Original line number Diff line number Diff line
@@ -2699,6 +2699,85 @@ public class ActivityRecordTests extends WindowTestsBase { 
        assertFalse("Starting window should not be present", activity.hasStartingWindow());

    }



    @Test

    public void testSetVisibility_visibleToVisible() {

        final ActivityRecord activity = new ActivityBuilder(mAtm)

                .setCreateTask(true).build();

        // By default, activity is visible.

        assertTrue(activity.isVisible());

        assertTrue(activity.mVisibleRequested);

        assertTrue(activity.mDisplayContent.mOpeningApps.contains(activity));

        assertFalse(activity.mDisplayContent.mClosingApps.contains(activity));



        // Request the activity to be visible. Although the activity is already visible, app

        // transition animation should be applied on this activity. This might be unnecessary, but

        // until we verify no logic relies on this behavior, we'll keep this as is.

        activity.setVisibility(true);

        assertTrue(activity.isVisible());

        assertTrue(activity.mVisibleRequested);

        assertTrue(activity.mDisplayContent.mOpeningApps.contains(activity));

        assertFalse(activity.mDisplayContent.mClosingApps.contains(activity));

    }



    @Test

    public void testSetVisibility_visibleToInvisible() {

        final ActivityRecord activity = new ActivityBuilder(mAtm)

                .setCreateTask(true).build();

        // By default, activity is visible.

        assertTrue(activity.isVisible());

        assertTrue(activity.mVisibleRequested);

        assertTrue(activity.mDisplayContent.mOpeningApps.contains(activity));

        assertFalse(activity.mDisplayContent.mClosingApps.contains(activity));



        // Request the activity to be invisible. Since the visibility changes, app transition

        // animation should be applied on this activity.

        activity.setVisibility(false);

        assertTrue(activity.isVisible());

        assertFalse(activity.mVisibleRequested);

        assertFalse(activity.mDisplayContent.mOpeningApps.contains(activity));

        assertTrue(activity.mDisplayContent.mClosingApps.contains(activity));

    }



    @Test

    public void testSetVisibility_invisibleToVisible() {

        final ActivityRecord activity = new ActivityBuilder(mAtm)

                .setCreateTask(true).setVisible(false).build();

        // Activiby is invisible. However ATMS requests it to become visible, since this is a top

        // activity.

        assertFalse(activity.isVisible());

        assertTrue(activity.mVisibleRequested);

        assertTrue(activity.mDisplayContent.mOpeningApps.contains(activity));

        assertFalse(activity.mDisplayContent.mClosingApps.contains(activity));



        // Request the activity to be visible. Since the visibility changes, app transition

        // animation should be applied on this activity.

        activity.setVisibility(true);

        assertFalse(activity.isVisible());

        assertTrue(activity.mVisibleRequested);

        assertTrue(activity.mDisplayContent.mOpeningApps.contains(activity));

        assertFalse(activity.mDisplayContent.mClosingApps.contains(activity));

    }



    @Test

    public void testSetVisibility_invisibleToInvisible() {

        final ActivityRecord activity = new ActivityBuilder(mAtm)

                .setCreateTask(true).setVisible(false).build();

        // Activiby is invisible. However ATMS requests it to become visible, since this is a top

        // activity.

        assertFalse(activity.isVisible());

        assertTrue(activity.mVisibleRequested);

        assertTrue(activity.mDisplayContent.mOpeningApps.contains(activity));

        assertFalse(activity.mDisplayContent.mClosingApps.contains(activity));



        // Request the activity to be invisible. Since the activity is already invisible, no app

        // transition should be applied on this activity.

        activity.setVisibility(false);

        assertFalse(activity.isVisible());

        assertFalse(activity.mVisibleRequested);

        assertFalse(activity.mDisplayContent.mOpeningApps.contains(activity));

        assertFalse(activity.mDisplayContent.mClosingApps.contains(activity));

    }



    private void assertHasStartingWindow(ActivityRecord atoken) {

        assertNotNull(atoken.mStartingSurface);

        assertNotNull(atoken.mStartingData);

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

+10 −3
Original line number Diff line number Diff line
@@ -805,6 +805,7 @@ class WindowTestsBase extends SystemServiceTestsBase { 
        private Bundle mIntentExtras;

        private boolean mOnTop = false;

        private ActivityInfo.WindowLayout mWindowLayout;

        private boolean mVisible = true;



        ActivityBuilder(ActivityTaskManagerService service) {

            mService = service;
@@ -930,6 +931,11 @@ class WindowTestsBase extends SystemServiceTestsBase { 
            return this;

        }



        ActivityBuilder setVisible(boolean visible) {

            mVisible = visible;

            return this;

        }



        ActivityRecord build() {

            SystemServicesTestRule.checkHoldsLock(mService.mGlobalLock);

            try {
@@ -1012,10 +1018,11 @@ class WindowTestsBase extends SystemServiceTestsBase { 
                    // root tasks (e.g. home root task).

                    mTask.moveToFront("createActivity");

                }

                // Make visible by default...

                if (mVisible) {

                    activity.mVisibleRequested = true;

                    activity.setVisible(true);

                }

            }



            final WindowProcessController wpc;

            if (mWpc != null) {