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

Commit a89365c2 authored by Ats Jenk's avatar Ats Jenk Committed by Android (Google) Code Review
Browse files

Merge "Use desktop mode flag for split logic" into main

parents a96537fa cd789874

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
@@ -397,10 +397,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.");