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

Commit 5645a22e authored by Jerry Chang's avatar Jerry Chang
Browse files

Include splitting apps when selecting the second app to split 

Bug: 249825511
Test: verify it can select an app in a current splitting pair as the
      second task to split.
Change-Id: I64ea0d2acc5c22f1280a74e56861d7b141e24ce6
parent b54fd1af

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java

+3 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; 
import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.wm.shell.common.split.SplitScreenConstants.CONTROLLED_ACTIVITY_TYPES;

import static com.android.wm.shell.common.split.SplitScreenConstants.CONTROLLED_WINDOWING_MODES;

import static com.android.wm.shell.common.split.SplitScreenConstants.CONTROLLED_WINDOWING_MODES_WHEN_ACTIVE;



import android.app.ActivityManager;

import android.app.ActivityManager.TaskDescription;
@@ -255,7 +255,8 @@ public class Task { 
        // Also consider undefined activity type to include tasks in overview right after rebooting

        // the device.

        final boolean isDockable = taskInfo.supportsMultiWindow

                && ArrayUtils.contains(CONTROLLED_WINDOWING_MODES, taskInfo.getWindowingMode())

                && ArrayUtils.contains(

                        CONTROLLED_WINDOWING_MODES_WHEN_ACTIVE, taskInfo.getWindowingMode())

                && (taskInfo.getActivityType() == ACTIVITY_TYPE_UNDEFINED

                || ArrayUtils.contains(CONTROLLED_ACTIVITY_TYPES, taskInfo.getActivityType()));

        return new Task(taskKey,