From 46b2beea264653ec9b0f8e654d3539bb777ee52b Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Tue, 11 Jul 2023 17:05:17 -0700 Subject: [PATCH] Cleanup ENABLE_SPLIT_FROM_WORKSPACE flag Fixes: 270393906 Flag: none Test: Compiles Change-Id: I1431f544b26cef5cd417c9a5a97f183b49fe7adc --- .../com/android/launcher3/uioverrides/QuickstepLauncher.java | 5 +---- src/com/android/launcher3/config/FeatureFlags.java | 4 ---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 3b53e8a7b6..f4ea5b0102 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -33,7 +33,6 @@ import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK; import static com.android.launcher3.LauncherState.OVERVIEW_SPLIT_SELECT; import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent; -import static com.android.launcher3.config.FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE; import static com.android.launcher3.config.FeatureFlags.ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE; import static com.android.launcher3.config.FeatureFlags.RECEIVE_UNFOLD_EVENTS_FROM_SYSUI; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP; @@ -406,9 +405,7 @@ public class QuickstepLauncher extends Launcher { } private List> getSplitShortcuts() { - - if (!ENABLE_SPLIT_FROM_WORKSPACE.get() || !mDeviceProfile.isTablet || - mSplitSelectStateController.isSplitSelectActive()) { + if (!mDeviceProfile.isTablet || mSplitSelectStateController.isSplitSelectActive()) { return Collections.emptyList(); } RecentsView recentsView = getOverviewPanel(); diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index a07028459a..5cff56f49e 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -353,10 +353,6 @@ public final class FeatureFlags { "Use inbuilt monochrome icons if app doesn't provide one"); // TODO(Block 28): Clean up flags - public static final BooleanFlag ENABLE_SPLIT_FROM_WORKSPACE = getDebugFlag(270393906, - "ENABLE_SPLIT_FROM_WORKSPACE", ENABLED, - "Enable initiating split screen from workspace."); - 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");