commit 44fcfa5bfd6a5540e0c1efcc1b687b2e4a5f0849
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 08 20:49:58 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 08 20:49:58 2021 +0000
tree 602a32a1716fa7f487bc2301aedb045a13c922b7
parent c010ea2f1b921430355168d0dcadd2fd73f9a2b0
parent 4e5664ac28fdaf1881408bc430fced6d27cc8396

Merge "Play fallback animation when overlay is shown." into sc-v2-dev

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 a83f51a..51d7914 100644
--- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
+++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1558,7 +1558,8 @@
 
                 View workspaceView = findWorkspaceView(appTargets);
                 boolean isWorkspaceViewVisible = workspaceView != null
-                        && !mLauncher.isInState(LauncherState.ALL_APPS);
+                        && !mLauncher.isInState(LauncherState.ALL_APPS)
+                        && !mLauncher.getWorkspace().isOverlayShown();
                 boolean playFallBackAnimation = !isWorkspaceViewVisible
                         && (launcherIsATargetWithMode(appTargets, MODE_OPENING)
                         || mLauncher.isForceInvisible());