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

Commit ff3b4f83 authored by Jainam Shah's avatar Jainam Shah Committed by Automerger Merge Worker
Browse files

Merge "Always create root task for ACTIVITY_TYPE_RECENTS" into udc-dev am: 4645c5fb 

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



Change-Id: I155dd4ce47d2fe17feae8dcc5a8f352c112d4ccc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 74c3a2e8 4645c5fb

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

+1 −1
Original line number Diff line number Diff line
@@ -6045,7 +6045,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    static boolean alwaysCreateRootTask(int windowingMode, int activityType) {

        // Always create a root task for fullscreen, freeform, and multi windowing

        // modes so that we can manage visual ordering and return types correctly.

        return activityType == ACTIVITY_TYPE_STANDARD

        return (activityType == ACTIVITY_TYPE_STANDARD || activityType == ACTIVITY_TYPE_RECENTS)

                && (windowingMode == WINDOWING_MODE_FULLSCREEN

                || windowingMode == WINDOWING_MODE_FREEFORM

                || windowingMode == WINDOWING_MODE_PINNED

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

+16 −13
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ import com.android.server.wm.LaunchParamsController.LaunchParams; 
import org.junit.Test;

import org.junit.runner.RunWith;



import java.util.List;



/**

 * Tests for the {@link TaskDisplayArea} container.

 *
@@ -349,7 +351,9 @@ public class TaskDisplayAreaTests extends WindowTestsBase { 
    @Test

    public void testReuseTaskAsRootTask() {

        final Task candidateTask = createTask(mDisplayContent);

        final int type = ACTIVITY_TYPE_STANDARD;

        List<Integer> activityTypesWithReusableRootTask = List.of(ACTIVITY_TYPE_STANDARD,

                ACTIVITY_TYPE_RECENTS);

        for (Integer type : activityTypesWithReusableRootTask) {

            assertGetOrCreateRootTask(WINDOWING_MODE_FULLSCREEN, type, candidateTask,

                    true /* reuseCandidate */);

            assertGetOrCreateRootTask(WINDOWING_MODE_UNDEFINED, type, candidateTask,
@@ -360,12 +364,11 @@ public class TaskDisplayAreaTests extends WindowTestsBase { 
                    true /* reuseCandidate */);

            assertGetOrCreateRootTask(WINDOWING_MODE_PINNED, type, candidateTask,

                    true /* reuseCandidate */);

        }



        final int windowingMode = WINDOWING_MODE_FULLSCREEN;

        assertGetOrCreateRootTask(windowingMode, ACTIVITY_TYPE_HOME, candidateTask,

                false /* reuseCandidate */);

        assertGetOrCreateRootTask(windowingMode, ACTIVITY_TYPE_RECENTS, candidateTask,

                false /* reuseCandidate */);

        assertGetOrCreateRootTask(windowingMode, ACTIVITY_TYPE_ASSISTANT, candidateTask,

                false /* reuseCandidate */);

        assertGetOrCreateRootTask(windowingMode, ACTIVITY_TYPE_DREAM, candidateTask,