commit e0a486773d4c4672ffdbfcf230956dba9140cb2b
author Tony Wickham <twickham@google.com> Tue Sep 28 21:44:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 28 21:44:32 2021 +0000
tree e0fbddf67173100b087ea1abe81bd5eca94bdb28
parent 7cb98961cea8df7e4da030e50d2e151fc40197b7
parent c2a7481cd4a0d9ba13c91ba8799c41989b4c0a68

Merge "Use falllback animation when going back to no icon" into sc-v2-dev am: 1ad55e6ab5 am: c2a7481cd4

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

Change-Id: I98653e32664f8e90c77af3654c62a34b771c6653

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
index f210e3a..ddb20a1 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1555,11 +1555,13 @@
             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));