commit 5a0834b0270418ccc89890c5fbcd44e56b81957f
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Apr 17 01:55:06 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 17 01:55:06 2021 +0000
tree aafb554727d9253204ffb0d3fb7767c9eca4b192
parent aac32faf5cc32989f8a4a131d1d83e2c4a3172ba
parent d9efe3a79c26e85d26dc6c876df16f802a1de0e0

Merge "Check if the TaskView is a live tile task in task launch animation" into sc-dev am: d9efe3a79c

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

Change-Id: Ie6d4ca508c9320dbd93d7a5d5dba2dcd395adc3e

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 c5deede..08889b1 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -2944,7 +2944,7 @@
         }
         mPendingAnimation.addEndListener(isSuccess -> {
             if (isSuccess) {
-                if (LIVE_TILE.get()) {
+                if (LIVE_TILE.get() && tv.isRunningTask()) {
                     finishRecentsAnimation(false /* toRecents */, null);
                     onTaskLaunchAnimationEnd(true /* success */);
                 } else {