From 3f2338a8e8a8ac8d55dc29057212a412eb3d1359 Mon Sep 17 00:00:00 2001 From: Sukesh Ram Date: Mon, 28 Aug 2023 18:31:54 +0000 Subject: [PATCH] Remove Windowing Prototype 1 from Codebase Refactor codebase to remove Proto1 as it is no longer supported. Test: aTest WMShellUnitTests Bug: 297217817 Change-Id: Ifaf67754c048d913fe203f4b34efc3c9c611039c --- .../DesktopVisibilityController.java | 3 +-- .../taskbar/KeyboardQuickSwitchController.java | 4 ++-- .../taskbar/TaskbarNavButtonController.java | 2 +- .../com/android/quickstep/AbsSwipeUpHandler.java | 2 +- .../com/android/quickstep/RecentTasksList.java | 4 ++-- .../android/quickstep/TaskShortcutFactory.java | 1 - .../android/quickstep/views/DesktopTaskView.java | 10 +--------- .../com/android/quickstep/views/RecentsView.java | 16 ++++++++-------- src/com/android/launcher3/Launcher.java | 9 +++------ 9 files changed, 19 insertions(+), 32 deletions(-) diff --git a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java index ecf483caa4..d7a4f76f05 100644 --- a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java +++ b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java @@ -106,8 +106,7 @@ public class DesktopVisibilityController { * Whether desktop mode is supported. */ private boolean isDesktopModeSupported() { - return SystemProperties.getBoolean("persist.wm.debug.desktop_mode", false) - || SystemProperties.getBoolean("persist.wm.debug.desktop_mode_2", false); + return SystemProperties.getBoolean("persist.wm.debug.desktop_mode_2", false); } /** diff --git a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java index 072fc3026e..dda8446083 100644 --- a/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java +++ b/quickstep/src/com/android/launcher3/taskbar/KeyboardQuickSwitchController.java @@ -109,7 +109,7 @@ public final class KeyboardQuickSwitchController implements DesktopVisibilityController desktopController = LauncherActivityInterface.INSTANCE.getDesktopVisibilityController(); final boolean onDesktop = - DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED + DesktopTaskView.DESKTOP_MODE_SUPPORTED && desktopController != null && desktopController.areFreeformTasksVisible(); @@ -136,7 +136,7 @@ public final class KeyboardQuickSwitchController implements // Hide all desktop tasks and show them on the hidden tile int hiddenDesktopTasks = 0; - if (DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED) { + if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) { DesktopTask desktopTask = findDesktopTask(tasks); if (desktopTask != null) { hiddenDesktopTasks = desktopTask.tasks.size(); diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java index fe8400f7c8..6d86b1e0c6 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarNavButtonController.java @@ -272,7 +272,7 @@ public class TaskbarNavButtonController implements TaskbarControllers.LoggableTa private void navigateHome() { TaskUtils.closeSystemWindowsAsync(CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY); - if (DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED) { + if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) { DesktopVisibilityController desktopVisibilityController = LauncherActivityInterface.INSTANCE.getDesktopVisibilityController(); if (desktopVisibilityController != null) { diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 1ef4039ce9..9b8dd5ff13 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -1161,7 +1161,7 @@ public abstract class AbsSwipeUpHandler, mStateCallback.setState(STATE_SCALED_CONTROLLER_HOME | STATE_CAPTURE_SCREENSHOT); // Notify the SysUI to use fade-in animation when entering PiP SystemUiProxy.INSTANCE.get(mContext).setPipAnimationTypeToAlpha(); - if (DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED) { + if (DesktopTaskView.DESKTOP_MODE_SUPPORTED) { // Notify the SysUI to stash desktop apps if they are visible DesktopVisibilityController desktopVisibilityController = mActivityInterface.getDesktopVisibilityController(); diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java index 34817c087b..1c74fbedc7 100644 --- a/quickstep/src/com/android/quickstep/RecentTasksList.java +++ b/quickstep/src/com/android/quickstep/RecentTasksList.java @@ -17,7 +17,7 @@ package com.android.quickstep; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; -import static com.android.quickstep.views.DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED; +import static com.android.quickstep.views.DesktopTaskView.DESKTOP_MODE_SUPPORTED; import static com.android.wm.shell.util.GroupedRecentTaskInfo.TYPE_FREEFORM; import android.annotation.TargetApi; @@ -270,7 +270,7 @@ public class RecentTasksList { TaskLoadResult allTasks = new TaskLoadResult(requestId, loadKeysOnly, rawTasks.size()); for (GroupedRecentTaskInfo rawTask : rawTasks) { - if (DESKTOP_IS_PROTO2_ENABLED && rawTask.getType() == TYPE_FREEFORM) { + if (DESKTOP_MODE_SUPPORTED && rawTask.getType() == TYPE_FREEFORM) { GroupTask desktopTask = createDesktopTask(rawTask); allTasks.add(desktopTask); continue; diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java index 901690bb9d..4177cede0d 100644 --- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java @@ -346,7 +346,6 @@ public interface TaskShortcutFactory { private boolean isAvailable(BaseDraggingActivity activity, int displayId) { return ActivityManagerWrapper.getInstance().supportsFreeformMultiWindow(activity) - && !SystemProperties.getBoolean("persist.wm.debug.desktop_mode", false) && !SystemProperties.getBoolean("persist.wm.debug.desktop_mode_2", false); } }; diff --git a/quickstep/src/com/android/quickstep/views/DesktopTaskView.java b/quickstep/src/com/android/quickstep/views/DesktopTaskView.java index 5f3fd0ca59..66557cc6b8 100644 --- a/quickstep/src/com/android/quickstep/views/DesktopTaskView.java +++ b/quickstep/src/com/android/quickstep/views/DesktopTaskView.java @@ -68,18 +68,10 @@ import java.util.function.Consumer; // TODO(b/249371338): TaskView needs to be refactored to have better support for N tasks. public class DesktopTaskView extends TaskView { - /** Flag to indicate whether desktop windowing proto 1 is enabled */ - private static final boolean DESKTOP_IS_PROTO1_ENABLED = SystemProperties.getBoolean( - "persist.wm.debug.desktop_mode", false); - /** Flag to indicate whether desktop windowing proto 2 is enabled */ - public static final boolean DESKTOP_IS_PROTO2_ENABLED = SystemProperties.getBoolean( + public static final boolean DESKTOP_MODE_SUPPORTED = SystemProperties.getBoolean( "persist.wm.debug.desktop_mode_2", false); - /** Flags to indicate whether desktop mode is available on the device */ - public static final boolean DESKTOP_MODE_SUPPORTED = - DESKTOP_IS_PROTO1_ENABLED || DESKTOP_IS_PROTO2_ENABLED; - private static final String TAG = DesktopTaskView.class.getSimpleName(); private static final boolean DEBUG = false; diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 76f9c2c9c9..f9b003f847 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -1615,7 +1615,7 @@ public abstract class RecentsView private static final FloatProperty HOTSEAT_WIDGET_SCALE = HOTSEAT_SCALE_PROPERTY_FACTORY.get(SCALE_INDEX_WIDGET_TRANSITION); - private static final boolean DESKTOP_MODE_1_SUPPORTED = - "1".equals(Utilities.getSystemProperty("persist.wm.debug.desktop_mode", "0")); - - private static final boolean DESKTOP_MODE_2_SUPPORTED = + private static final boolean DESKTOP_MODE_SUPPORTED = "1".equals(Utilities.getSystemProperty("persist.wm.debug.desktop_mode_2", "0")); @Thunk @@ -3301,7 +3298,7 @@ public class Launcher extends StatefulActivity } private void updateDisallowBack() { - if (DESKTOP_MODE_1_SUPPORTED || DESKTOP_MODE_2_SUPPORTED) { + if (DESKTOP_MODE_SUPPORTED) { // Do not disable back in launcher when prototype behavior is enabled return; }