summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-08-22 21:22:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-08-22 21:22:47 +0000
commit2eb470896013ecbf5a790a80b97e8ce9060ce307 (patch)
tree132cfd227695398db5f2c2844ab5039eba0841c9
parentf2b97f8cd833234515505d3c280fba4a3b41026f (diff)
parentdbbed570949b7f41c77109c0553387a2305368bb (diff)
downloadandroid_packages_apps_Trebuchet-2eb470896013ecbf5a790a80b97e8ce9060ce307.tar.gz
android_packages_apps_Trebuchet-2eb470896013ecbf5a790a80b97e8ce9060ce307.tar.bz2
android_packages_apps_Trebuchet-2eb470896013ecbf5a790a80b97e8ce9060ce307.zip
Merge "Revert "Use clear-all recent tasks call"" into ub-launcher3-edmonton-polish
-rw-r--r--quickstep/libs/sysui_shared.jarbin136447 -> 133150 bytes
-rw-r--r--quickstep/src/com/android/quickstep/views/RecentsView.java6
2 files changed, 4 insertions, 2 deletions
diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar
index 9d91d7ecc..27de1e907 100644
--- a/quickstep/libs/sysui_shared.jar
+++ b/quickstep/libs/sysui_shared.jar
Binary files differ
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index d0b7622e7..e18708b19 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -935,8 +935,10 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
mPendingAnimation = pendingAnimation;
mPendingAnimation.addEndListener((onEndListener) -> {
if (onEndListener.isSuccess) {
- // Remove all the task views now
- ActivityManagerWrapper.getInstance().removeAllRecentTasks();
+ int taskViewCount = getTaskViewCount();
+ for (int i = 0; i < taskViewCount; i++) {
+ removeTask(getTaskViewAt(i).getTask(), -1, onEndListener, false);
+ }
removeAllViews();
onAllTasksRemoved();
}