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

Commit 07e2e433 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Migrate ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS to aconfig" into main

parents ed56be4f 859edd00

aconfig/launcher.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -62,3 +62,10 @@ flag { 
    description: "Enables taskbar pinning to allow user to switch between transient and persistent taskbar flavors."

    bug: "270396583"

}



flag {

    name: "enable_split_from_fullscreen_with_keyboard_shortcuts"

    namespace: "launcher"

    description: "Enables initiating split from a fullscreen app using keyboard shortcuts"

    bug: "270394122"

}

quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.quickstep.util;



import static com.android.launcher3.config.FeatureFlags.ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS;

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,7 +191,7 @@ public class SplitToWorkspaceController { 
    }



    private boolean shouldIgnoreSecondSplitLaunch() {

        return (!ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS.get()

        return (!enableSplitFromFullscreenWithKeyboardShortcuts()

                && !FeatureFlags.enableSplitContextually()

                && !isDesktopModeSupported())

                || !mController.isSplitSelectActive();

quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.quickstep.util;



import static com.android.launcher3.config.FeatureFlags.ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS;

import static com.android.launcher3.config.FeatureFlags.enableSplitFromFullscreenWithKeyboardShortcuts;

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 (!ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS.get()) {

        if (!enableSplitFromFullscreenWithKeyboardShortcuts()) {

            return;

        }

        RecentsAnimationCallbacks callbacks = new RecentsAnimationCallbacks(

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

+6 −1
Original line number Diff line number Diff line
@@ -408,11 +408,16 @@ public final class FeatureFlags { 
            "USE_LOCAL_ICON_OVERRIDES", ENABLED,

            "Use inbuilt monochrome icons if app doesn't provide one");



    // TODO(Block 28): Clean up flags

    // 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,

            "Enable initiating split screen from workspace to workspace.");