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

Commit 48863151 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Start activity with focus root task for staged split" into sc-dev am: 64458eaa 

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

Change-Id: I5271714a1e56d1f4f838e485f3d0b6d3de0b5155
parents 7b154cd7 64458eaa

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

+9 −1
Original line number Diff line number Diff line
@@ -1274,7 +1274,15 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 


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

            if (mLaunchRootTasks.get(i).contains(windowingMode, activityType)) {

                return mLaunchRootTasks.get(i).task;

                final Task launchRootTask = mLaunchRootTasks.get(i).task;

                // Return the focusable root task for improving the UX with staged split screen.

                final Task adjacentRootTask = launchRootTask != null

                        ? launchRootTask.mAdjacentTask : null;

                if (adjacentRootTask != null && adjacentRootTask.isFocusedRootTaskOnDisplay()) {

                    return adjacentRootTask;

                } else {

                    return launchRootTask;

                }

            }

        }

        return null;

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

+23 −0
Original line number Diff line number Diff line
@@ -100,6 +100,29 @@ public class TaskDisplayAreaTests extends WindowTestsBase { 
        assertNull(actualRootTask);

    }



    @Test

    public void getLaunchRootTask_checksFocusedRootTask() {

        final TaskDisplayArea taskDisplayArea = mRootWindowContainer.getDefaultTaskDisplayArea();

        final Task rootTask = createTaskWithActivity(

                taskDisplayArea,

                WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD, ON_TOP, true);

        rootTask.mCreatedByOrganizer = true;



        final Task adjacentRootTask = createTask(

                mDisplayContent, WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD);

        adjacentRootTask.mCreatedByOrganizer = true;

        adjacentRootTask.mAdjacentTask = rootTask;

        rootTask.mAdjacentTask = adjacentRootTask;



        taskDisplayArea.setLaunchRootTask(rootTask,

                new int[]{WINDOWING_MODE_MULTI_WINDOW}, new int[]{ACTIVITY_TYPE_STANDARD});



        Task actualRootTask = taskDisplayArea.getLaunchRootTask(

                WINDOWING_MODE_MULTI_WINDOW, ACTIVITY_TYPE_STANDARD, null /* options */,

                null /* sourceTask */, 0 /*launchFlags*/);

        assertTrue(actualRootTask.isFocusedRootTaskOnDisplay());

    }



    @Test

    public void getLaunchRootTask_fromLaunchAdjacentFlagRoot_checksAdjacentRoot() {

        final ActivityRecord activity = createNonAttachedActivityRecord(mDisplayContent);