commit f7577df404d4f7b29f7cf183d9459643914a42bc
author Tracy Zhou <tracyzhou@google.com> Wed Jun 23 17:29:18 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 23 17:29:18 2021 +0000
tree 37ea566a7a4b6658cfc450adf0b1c635db0e0936
parent 04331650f8a7b3530ebb416e5913f8edf30e92df
parent 2591768d543f0b1f98a23c509456349f70e07247

Finish recents animation on task dismissal only if the task is a live tile task am: 2591768d54

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

Change-Id: I9607f75e34453a8f92915370b83db03891933657

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 7adac22..b87e369 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2421,12 +2421,12 @@
                 if (success) {
                     if (shouldRemoveTask) {
                         if (dismissedTaskView.getTask() != null) {
-                            finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
-                                    () -> {
-                                UI_HELPER_EXECUTOR.getHandler().postDelayed(() ->
-                                        ActivityManagerWrapper.getInstance().removeTask(
-                                                dismissedTaskId), REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
-                            });
+                            if (LIVE_TILE.get() && dismissedTaskView.isRunningTask()) {
+                                finishRecentsAnimation(true /* toRecents */, false /* shouldPip */,
+                                        () -> removeTaskInternal(dismissedTaskId));
+                            } else {
+                                removeTaskInternal(dismissedTaskId);
+                            }
                             mActivity.getStatsLogManager().logger()
                                     .withItemInfo(dismissedTaskView.getItemInfo())
                                     .log(LAUNCHER_TASK_DISMISS_SWIPE_UP);
@@ -2472,6 +2472,12 @@
         return anim;
     }
 
+    private void removeTaskInternal(int dismissedTaskId) {
+        UI_HELPER_EXECUTOR.getHandler().postDelayed(
+                () -> ActivityManagerWrapper.getInstance().removeTask(dismissedTaskId),
+                REMOVE_TASK_WAIT_FOR_APP_STOP_MS);
+    }
+
     /**
      * @return {@code true} if one of the task thumbnails would intersect/overlap with the
      *         {@link #mSplitPlaceholderView}