Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f909a72f authored by Vinit Nayak's avatar Vinit Nayak Committed by Android (Google) Code Review
Browse files

Merge "Cleanup ENABLE_SPLIT_FROM_WORKSPACE flag" into udc-qpr-dev

parents 30b9bc75 46b2beea

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+1 −4
Original line number Diff line number Diff line
@@ -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<SystemShortcut.Factory<QuickstepLauncher>> getSplitShortcuts() {



        if (!ENABLE_SPLIT_FROM_WORKSPACE.get() || !mDeviceProfile.isTablet ||

                mSplitSelectStateController.isSplitSelectActive()) {

        if (!mDeviceProfile.isTablet || mSplitSelectStateController.isSplitSelectActive()) {

            return Collections.emptyList();

        }

        RecentsView recentsView = getOverviewPanel();

src/com/android/launcher3/config/FeatureFlags.java

+0 −4
Original line number Diff line number Diff line
@@ -358,10 +358,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");