From 6b31ed99d9e1087e43dfd95b10cfe64bc29a3ed7 Mon Sep 17 00:00:00 2001 From: Ats Jenk Date: Fri, 19 Aug 2022 12:32:58 -0700 Subject: [PATCH] Hide freeform button from app menu in recents When desktop windowing prototype is enabled, we should only be able to switch apps to freeform mode via the quick tile. Disabling other routes to put individual apps to freeform. Test: visually verified that freeform button is not visible when desktop windowing prototype flag is enabled Bug: 242906219 Change-Id: Ib1ce75969b67f30d82262927e2e4113fab2c4956 --- quickstep/src/com/android/quickstep/TaskShortcutFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java index 69a295b8c8..a0860eef8e 100644 --- a/quickstep/src/com/android/quickstep/TaskShortcutFactory.java +++ b/quickstep/src/com/android/quickstep/TaskShortcutFactory.java @@ -26,6 +26,7 @@ import android.graphics.Color; import android.graphics.Rect; import android.os.Handler; import android.os.Looper; +import android.os.SystemProperties; import android.view.View; import android.view.WindowInsets; import android.window.SplashScreen; @@ -278,7 +279,8 @@ public interface TaskShortcutFactory { } private boolean isAvailable(BaseDraggingActivity activity, int displayId) { - return ActivityManagerWrapper.getInstance().supportsFreeformMultiWindow(activity); + return ActivityManagerWrapper.getInstance().supportsFreeformMultiWindow(activity) + && !SystemProperties.getBoolean("persist.wm.debug.desktop_mode", false); } };