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

Commit cd789874 authored by Ats Jenk's avatar Ats Jenk
Browse files

Use desktop mode flag for split logic 

Remove launcher specific split from desktop flag and use the desktop
windowing feature flag.

Bug: 305095670
Flag: persist.wm.debug.desktop_mode_2
Test: enable desktop mode flag, toggle split from a desktop task
Change-Id: I62b91de3deaa5bba3435faf3a268f5b58cda8276
parent 6ebfd954

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

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.quickstep.util;



import static com.android.launcher3.Utilities.postAsyncCallback;

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

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DESKTOP_MODE_SPLIT_LEFT_TOP;

import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_DESKTOP_MODE_SPLIT_RIGHT_BOTTOM;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
@@ -92,6 +91,7 @@ import com.android.quickstep.SplitSelectionListener; 
import com.android.quickstep.SystemUiProxy;

import com.android.quickstep.TaskAnimationManager;

import com.android.quickstep.TaskViewUtils;

import com.android.quickstep.views.DesktopTaskView;

import com.android.quickstep.views.FloatingTaskView;

import com.android.quickstep.views.GroupedTaskView;

import com.android.quickstep.views.RecentsView;
@@ -815,7 +815,7 @@ public class SplitSelectStateController { 
                @Override

                public boolean onRequestSplitSelect(ActivityManager.RunningTaskInfo taskInfo,

                        int splitPosition, Rect taskBounds) {

                    if (!ENABLE_SPLIT_FROM_DESKTOP_TO_WORKSPACE.get()) return false;

                    if (!DesktopTaskView.DESKTOP_MODE_SUPPORTED) return false;

                    MAIN_EXECUTOR.execute(() -> enterSplitSelect(taskInfo, splitPosition,

                            taskBounds));

                    return true;

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

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


package com.android.quickstep.util;



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

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

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

import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
@@ -45,6 +44,7 @@ import com.android.launcher3.icons.BitmapInfo; 
import com.android.launcher3.icons.IconCache;

import com.android.launcher3.model.data.PackageItemInfo;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.quickstep.views.DesktopTaskView;

import com.android.quickstep.views.FloatingTaskView;

import com.android.quickstep.views.RecentsView;

import com.android.systemui.shared.system.InteractionJankMonitorWrapper;
@@ -193,7 +193,7 @@ public class SplitToWorkspaceController { 
    private boolean shouldIgnoreSecondSplitLaunch() {

        return (!ENABLE_SPLIT_FROM_FULLSCREEN_WITH_KEYBOARD_SHORTCUTS.get()

                && !ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE.get()

                && !ENABLE_SPLIT_FROM_DESKTOP_TO_WORKSPACE.get())

                && !DesktopTaskView.DESKTOP_MODE_SUPPORTED)

                || !mController.isSplitSelectActive();

    }

}

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

+0 −4
Original line number Diff line number Diff line
@@ -394,10 +394,6 @@ public final class FeatureFlags { 
            270393453, "ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE", DISABLED,

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



    public static final BooleanFlag ENABLE_SPLIT_FROM_DESKTOP_TO_WORKSPACE = getDebugFlag(

            279586624, "ENABLE_SPLIT_FROM_DESKTOP_TO_WORKSPACE", DISABLED,

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



    public static final BooleanFlag ENABLE_TRACKPAD_GESTURE = getDebugFlag(271010401,

            "ENABLE_TRACKPAD_GESTURE", ENABLED, "Enables trackpad gesture.");