PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use enableSplitContextually() to guard split keyboard shortcut feature" into main

Browse Source
This commit is contained in:
Tracy Zhou
2023-11-30 18:43:13 +00:00
committed by Android (Google) Code Review
parent 31ae3a5f83 6209f34b02
commit aa759645cf
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/util/SplitToWorkspaceController.java
+1 -3
View File
@@ -16,7 +16,6 @@
package com.android.quickstep.util;
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;
@@ -190,8 +189,7 @@ public class SplitToWorkspaceController {
}
private boolean shouldIgnoreSecondSplitLaunch() {
return (!enableSplitFromFullscreenWithKeyboardShortcuts()
&& !FeatureFlags.enableSplitContextually()
return (!FeatureFlags.enableSplitContextually()
&& !isDesktopModeSupported())
|| !mController.isSplitSelectActive();
}
quickstep/src/com/android/quickstep/util/SplitWithKeyboardShortcutController.java
+2 -2
View File
@@ -16,7 +16,7 @@
package com.android.quickstep.util;
import static com.android.launcher3.config.FeatureFlags.enableSplitFromFullscreenWithKeyboardShortcuts;
import static com.android.launcher3.config.FeatureFlags.enableSplitContextually;
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 (!enableSplitFromFullscreenWithKeyboardShortcuts()) {
if (!enableSplitContextually()) {
return;
}
RecentsAnimationCallbacks callbacks = new RecentsAnimationCallbacks(
src/com/android/launcher3/config/FeatureFlags.java
-9
View File
@@ -432,15 +432,6 @@ public final class FeatureFlags {
"USE_LOCAL_ICON_OVERRIDES", ENABLED,
"Use inbuilt monochrome icons if app doesn't provide one");
// 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,