From b43374e9f973338185904432ac720f852941e6b1 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Tue, 28 Sep 2021 09:19:47 -0700
Subject: [PATCH] Use falllback animation when going back to no icon

Test: Open settings from the shade (not on home screen) and go back, ensure animates reasonably
Bug: 197656915
Change-Id: I78baa3ad03655f66b9e9727e62247ec8a15f3bf9
---
 .../com/android/launcher3/QuickstepTransitionManager.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index 25371348af..61596ef41e 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1540,11 +1540,13 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
             if (anim == null) {
                 anim = new AnimatorSet();
 
-                boolean playFallBackAnimation = mLauncher.isInState(LauncherState.ALL_APPS)
+                View workspaceView = findWorkspaceView(appTargets);
+                boolean isWorkspaceViewVisible = workspaceView != null
+                        && !mLauncher.isInState(LauncherState.ALL_APPS);
+                boolean playFallBackAnimation = !isWorkspaceViewVisible
                         && (launcherIsATargetWithMode(appTargets, MODE_OPENING)
                         || mLauncher.isForceInvisible());
 
-                View workspaceView = findWorkspaceView(appTargets);
                 boolean playWorkspaceReveal = true;
                 if (mFromUnlock) {
                     anim.play(getUnlockWindowAnimator(appTargets, wallpaperTargets));