From ab47e04df5b11006704453741c4108aaa4fdcc52 Mon Sep 17 00:00:00 2001 From: Beth Thibodeau Date: Mon, 14 Jan 2019 10:42:54 -0500 Subject: [PATCH] Add compat for secondary splitscreen window option Test: Tested that compiles and option works in plugin Change-Id: I4861e09fe4bba6c1a0ec57395939aa293dd95347 (cherry picked from commit 401c20314169cfd2f50c926bdabd78d4c76502d3) --- .../shared/system/ActivityOptionsCompat.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java index a6b66e70c122c..ea6fb48c67e76 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java @@ -20,6 +20,7 @@ import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY; +import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY; import android.app.ActivityOptions; import android.content.Context; @@ -31,11 +32,20 @@ import android.os.Handler; public abstract class ActivityOptionsCompat { /** - * @return ActivityOptions for starting a task in split screen. + * @return ActivityOptions for starting a task in split screen as the primary window. */ public static ActivityOptions makeSplitScreenOptions(boolean dockTopLeft) { + return makeSplitScreenOptions(dockTopLeft, true); + } + + /** + * @return ActivityOptions for starting a task in split screen. + */ + public static ActivityOptions makeSplitScreenOptions(boolean dockTopLeft, boolean isPrimary) { final ActivityOptions options = ActivityOptions.makeBasic(); - options.setLaunchWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY); + options.setLaunchWindowingMode(isPrimary + ? WINDOWING_MODE_SPLIT_SCREEN_PRIMARY + : WINDOWING_MODE_SPLIT_SCREEN_SECONDARY); options.setSplitScreenCreateMode(dockTopLeft ? SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT : SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT);