From 5645a22e7e2d7f01b584ce8767301de6fab188c2 Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Mon, 7 Nov 2022 03:10:24 +0000 Subject: [PATCH] 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 --- .../src/com/android/systemui/shared/recents/model/Task.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java index 647dd47159e08..08904658a27dd 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java @@ -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,