Merge "Disable quickswitch for desktop windowing" into tm-qpr-dev am: 5e74542570 am: c6d31fa3d8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21423028 Change-Id: Icf3b48826a83b41828546f771bf92b8469970955 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 19:37:42 +00:00
parent 2e6aaa373a c6d31fa3d8
commit 0571d30706
3 changed files with 15 additions and 0 deletions
@@ -1164,6 +1164,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
            return LAST_TASK;
        }

+        if (DesktopTaskView.DESKTOP_MODE_SUPPORTED && endTarget == NEW_TASK) {
+            // TODO(b/268075592): add support for quickswitch to/from desktop
+            return LAST_TASK;
+        }
+
        return endTarget;
    }