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

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

Change-Id: Id87b86ce99aa15149b6eb24fb0a5208978cc6937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ats Jenk
2023-03-17 00:25:39 +00:00
committed by Automerger Merge Worker
@@ -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) {