From 49282f8eccdbc44fb0c570f590e0ec96b311c360 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Wed, 23 Oct 2024 09:50:13 -0400 Subject: [PATCH] Migrate away from listening for main/side specific stage types Bug: 349828130 Flag: com.android.wm.shell.enable_flexible_split Test: Manual, incremental change, not stable yet. Works fine with flag off Change-Id: Ief1a41fb9f32cd99266f0ac73b17d5676ead042a --- .../com/android/quickstep/TopTaskTracker.java | 5 ++++- .../util/SplitConfigurationOptions.java | 22 ++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/quickstep/src/com/android/quickstep/TopTaskTracker.java b/quickstep/src/com/android/quickstep/TopTaskTracker.java index 80d6137344..7065f37ebf 100644 --- a/quickstep/src/com/android/quickstep/TopTaskTracker.java +++ b/quickstep/src/com/android/quickstep/TopTaskTracker.java @@ -23,6 +23,8 @@ import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; import static android.view.Display.DEFAULT_DISPLAY; import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT; +import static com.android.launcher3.util.SplitConfigurationOptions.STAGE_TYPE_A; +import static com.android.wm.shell.Flags.enableFlexibleSplit; import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_SPLIT; import android.app.ActivityManager.RunningTaskInfo; @@ -228,7 +230,8 @@ public class TopTaskTracker extends ISplitScreenListener.Stub return; } - if (stage == SplitConfigurationOptions.STAGE_TYPE_MAIN) { + if (stage == SplitConfigurationOptions.STAGE_TYPE_MAIN + || (enableFlexibleSplit() && stage == STAGE_TYPE_A)) { mMainStagePosition.taskId = taskId; } else { mSideStagePosition.taskId = taskId; diff --git a/src/com/android/launcher3/util/SplitConfigurationOptions.java b/src/com/android/launcher3/util/SplitConfigurationOptions.java index f457e4e369..44a7c6fa74 100644 --- a/src/com/android/launcher3/util/SplitConfigurationOptions.java +++ b/src/com/android/launcher3/util/SplitConfigurationOptions.java @@ -73,7 +73,27 @@ public final class SplitConfigurationOptions { */ public static final int STAGE_TYPE_SIDE = 1; - @IntDef({STAGE_TYPE_UNDEFINED, STAGE_TYPE_MAIN, STAGE_TYPE_SIDE}) + /** + * Position independent stage identifier for a given Stage + */ + public static final int STAGE_TYPE_A = 2; + /** + * Position independent stage identifier for a given Stage + */ + public static final int STAGE_TYPE_B = 3; + /** + * Position independent stage identifier for a given Stage + */ + public static final int STAGE_TYPE_C = 4; + + @IntDef({ + STAGE_TYPE_UNDEFINED, + STAGE_TYPE_MAIN, + STAGE_TYPE_SIDE, + STAGE_TYPE_A, + STAGE_TYPE_B, + STAGE_TYPE_C + }) public @interface StageType {} ///////////////////////////////////