Merge "Make sure desktop task view is only used in proto 2" into tm-qpr-dev am: b219e31477 am: aacd5d330b am: e861a047b8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121446

Change-Id: I27bec22ae25320fbca66360728a88a11c97274ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ats Jenk authored and Automerger Merge Worker committed 2023-03-16 23:56:19 +00:00
commit 8ee3336e66
1 file changed
+1 -1
@@ -2616,7 +2616,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
}
private boolean hasDesktopTask(Task[] runningTasks) {
if (!DESKTOP_MODE_SUPPORTED) {
if (!DesktopTaskView.DESKTOP_IS_PROTO2_ENABLED) {
return false;
}
for (Task task : runningTasks) {