Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include splitting apps when selecting the second app to split" into tm-qpr-dev am: b05e25e911

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

Change-Id: I5e2ce99ce706a0e8829ebea7a91e3d49890c73b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-11-10 00:32:02 +00:00
committed by Automerger Merge Worker
parent 4fbe0ccfbf b05e25e911
commit 814d9d52ff
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
import static android.view.Display.DEFAULT_DISPLAY; 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_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;
import android.app.ActivityManager.TaskDescription; 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 // Also consider undefined activity type to include tasks in overview right after rebooting
// the device. // the device.
final boolean isDockable = taskInfo.supportsMultiWindow 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 && (taskInfo.getActivityType() == ACTIVITY_TYPE_UNDEFINED
|| ArrayUtils.contains(CONTROLLED_ACTIVITY_TYPES, taskInfo.getActivityType())); || ArrayUtils.contains(CONTROLLED_ACTIVITY_TYPES, taskInfo.getActivityType()));
return new Task(taskKey, return new Task(taskKey,