commit d537968b3558e7ae6e0948ad818d56113fb0d3ea
author Tracy Zhou <tracyzhou@google.com> Tue Jun 22 21:09:05 2021 -0700
committer Tracy Zhou <tracyzhou@google.com> Wed Jun 23 17:18:00 2021 +0000
tree a5ede03821e4d10d0994ad334872d07d185b2c0a
parent 835fab230508969201bb691ea34d4e16733b1f58

Finish recents animation on task dismissal only if the task is a live tile task

Fixes: 191831190
Test: manual
Change-Id: Ie1dd02a2e8cc401a613a0ed2199400712c6d5291
Merged-In: Ie1dd02a2e8cc401a613a0ed2199400712c6d5291

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 2b256a4..0cb7501 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2369,13 +2369,12 @@
                 if (success) {
                     if (shouldRemoveTask) {
                         if (taskView.getTask() != null) {
-                            finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
-                                    () -> {
-                                UI_HELPER_EXECUTOR.getHandler().postDelayed(() ->
-                                        ActivityManagerWrapper.getInstance().removeTask(
-                                                taskView.getTask().key.id),
-                                        REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
-                            });
+                            if (LIVE_TILE.get() && taskView.isRunningTask()) {
+                                finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
+                                        () -> removeTaskInternal(taskView));
+                            } else {
+                                removeTaskInternal(taskView);
+                            }
                             mActivity.getStatsLogManager().logger()
                                     .withItemInfo(taskView.getItemInfo())
                                     .log(LAUNCHER_TASK_DISMISS_SWIPE_UP);
@@ -2421,6 +2420,13 @@
         return anim;
     }
 
+    private void removeTaskInternal(TaskView taskView) {
+        UI_HELPER_EXECUTOR.getHandler().postDelayed(() ->
+                        ActivityManagerWrapper.getInstance().removeTask(
+                                taskView.getTask().key.id),
+                REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
+    }
+
     /**
      * @return {@code true} if one of the task thumbnails would intersect/overlap with the
      *         {@link #mSplitPlaceholderView}