From 8f5b9dd8334f8156aacd31a4e90841a84158d252 Mon Sep 17 00:00:00 2001 From: Ats Jenk Date: Fri, 2 Dec 2022 11:42:17 -0800 Subject: [PATCH] Check for both proto flags for common logic Desktop mode has prototype 1 and prototype 2. Check for both flags when logic is shared. Bug: 260645044 Test: manual, check desktop mode 1 works Change-Id: I40e84440222a9d5f007c2450606cd7c8f9628da2 --- .../statehandlers/DesktopVisibilityController.java | 3 ++- .../src/com/android/quickstep/TaskShortcutFactory.java | 3 ++- .../src/com/android/quickstep/views/DesktopTaskView.java | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java index 0c8952d705..a205d19f3c 100644 --- a/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java +++ b/quickstep/src/com/android/launcher3/statehandlers/DesktopVisibilityController.java @@ -42,7 +42,8 @@ public class DesktopVisibilityController { * Whether desktop mode is supported. */ private boolean isDesktopModeSupported() { - return SystemProperties.getBoolean("persist.wm.debug.desktop_mode", false); + return 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/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java index eae79dfa19..663525d0c5 100644 --- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java @@ -303,7 +303,8 @@ 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", 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 8c43fd108f..308249cb1e 100644 --- a/quickstep/src/com/android/quickstep/views/DesktopTaskView.java +++ b/quickstep/src/com/android/quickstep/views/DesktopTaskView.java @@ -59,9 +59,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 mode is available on the device */ - public static final boolean DESKTOP_MODE_SUPPORTED = SystemProperties.getBoolean( - "persist.wm.debug.desktop_mode", false); + /** Flags to indicate whether desktop mode is available on the device */ + public static final boolean DESKTOP_MODE_SUPPORTED = + SystemProperties.getBoolean("persist.wm.debug.desktop_mode", false) + || SystemProperties.getBoolean("persist.wm.debug.desktop_mode_2", false); private static final String TAG = DesktopTaskView.class.getSimpleName();