commit cd17e997f2b24b333e2a642f89244c94504c5258
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Nov 08 21:18:27 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 08 21:18:27 2021 +0000
tree 0b700ce362992f4d08af6fb5d2a1b1d5b4efcd96
parent 06af9641b29d71148a8b15ebb30a876026b74aa6
parent c6aa4b006a19fd5b9c5d6fd7c532a58c3c0b8f52

Merge "Play fallback animation when overlay is shown." into sc-v2-dev am: 44fcfa5bfd am: c6aa4b006a

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

Change-Id: Ia4fd2252ce84dd4a8ebca7c34060a54fa2f1eb57

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());