Merge "Make sure desktop task view is only used in proto 2" into tm-qpr-dev am: b219e31477 am: aacd5d330b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121446 Change-Id: I20d2edfb566aeef128c3e05e030bb49dfe189d3b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user