From 6209f34b020287021b345b8f21218507b7c1e07e Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Wed, 29 Nov 2023 22:20:42 -0800 Subject: [PATCH] Use enableSplitContextually() to guard split keyboard shortcut feature enableSplitFromFullscreenWithKeyboardShortcuts() depends on enableSplitContextually() from the product perspective, hence merging these two flags Bug: 270394122 Test: N/A Change-Id: Iecf46a62bfa21ed0c3bad9ca8c9e2646b3aebc78 --- .../quickstep/util/SplitToWorkspaceController.java | 4 +--- .../util/SplitWithKeyboardShortcutController.java | 4 ++-- src/com/android/launcher3/config/FeatureFlags.java | 9 --------- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java b/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java index bdbdfd8084..5dd86d4a7c 100644 --- a/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java +++ b/quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java @@ -16,7 +16,6 @@ package com.android.quickstep.util; -import static com.android.launcher3.config.FeatureFlags.enableSplitFromFullscreenWithKeyboardShortcuts; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; import static com.android.quickstep.views.DesktopTaskView.isDesktopModeSupported; @@ -191,8 +190,7 @@ public class SplitToWorkspaceController { } private boolean shouldIgnoreSecondSplitLaunch() { - return (!enableSplitFromFullscreenWithKeyboardShortcuts() - && !FeatureFlags.enableSplitContextually() + return (!FeatureFlags.enableSplitContextually() && !isDesktopModeSupported()) || !mController.isSplitSelectActive(); } diff --git a/quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java b/quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java index 8f719d0323..cb32c6c1e5 100644 --- a/quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java +++ b/quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java @@ -16,7 +16,7 @@ package com.android.quickstep.util; -import static com.android.launcher3.config.FeatureFlags.enableSplitFromFullscreenWithKeyboardShortcuts; +import static com.android.launcher3.config.FeatureFlags.enableSplitContextually; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_KEYBOARD_SHORTCUT_SPLIT_LEFT_TOP; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_KEYBOARD_SHORTCUT_SPLIT_RIGHT_BOTTOM; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; @@ -75,7 +75,7 @@ public class SplitWithKeyboardShortcutController { @BinderThread public void enterStageSplit(boolean leftOrTop) { - if (!enableSplitFromFullscreenWithKeyboardShortcuts()) { + if (!enableSplitContextually()) { return; } RecentsAnimationCallbacks callbacks = new RecentsAnimationCallbacks( diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 14d1683585..f85802d135 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -432,15 +432,6 @@ public final class FeatureFlags { "USE_LOCAL_ICON_OVERRIDES", ENABLED, "Use inbuilt monochrome icons if app doesn't provide one"); - // Aconfig migration complete for ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS. - public static final BooleanFlag ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS = - getDebugFlag(270394122, "ENABLE_SPLIT_FROM_FULLSCREEN_SHORTCUT", DISABLED, - "Enable splitting from fullscreen app with keyboard shortcuts"); - public static boolean enableSplitFromFullscreenWithKeyboardShortcuts() { - return ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS.get() - || Flags.enableSplitFromFullscreenWithKeyboardShortcuts(); - } - // Aconfig migration complete for ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE. public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE = getDebugFlag( 270393453, "ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE", DISABLED,