Merge "Converting more tests to TAPL" into ub-launcher3-qt-dev
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
index e7e4189..b26fdce 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java
@@ -368,6 +368,9 @@
} else {
mSnapshotView.setThumbnail(null, null);
setIcon(null);
+ // Reset the task thumbnail reference as well (it will be fetched from the cache or
+ // reloaded next time we need it)
+ mTask.thumbnail = null;
}
}
@@ -488,9 +491,6 @@
mSnapshotView.setThumbnail(mTask, null);
setOverlayEnabled(false);
onTaskListVisibilityChanged(false);
- if (mTask != null) {
- mTask.thumbnail = null;
- }
}
@Override
diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java
index 3538373..f27ba85 100644
--- a/quickstep/src/com/android/quickstep/RecentTasksList.java
+++ b/quickstep/src/com/android/quickstep/RecentTasksList.java
@@ -84,7 +84,7 @@
final int requestLoadId = mChangeId;
Runnable resultCallback = callback == null
? () -> { }
- : () -> callback.accept(mTasks);
+ : () -> callback.accept(copyOf(mTasks));
if (mLastLoadedId == mChangeId && (!mLastLoadHadKeysOnly || loadKeysOnly)) {
// The list is up to date, callback with the same list
@@ -183,4 +183,14 @@
return allTasks;
}
+
+ private ArrayList<Task> copyOf(ArrayList<Task> tasks) {
+ ArrayList<Task> newTasks = new ArrayList<>();
+ for (int i = 0; i < tasks.size(); i++) {
+ Task t = tasks.get(i);
+ newTasks.add(new Task(t.key, t.colorPrimary, t.colorBackground, t.isDockable,
+ t.isLocked, t.taskDescription, t.topActivity));
+ }
+ return newTasks;
+ }
}
\ No newline at end of file