| commit | 1f60b796e3f56f09fac0c8bcf8f56e57fd7d90c0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Nov 08 20:59:53 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 08 20:59:53 2021 +0000 |
| tree | 9a976a91856f054aeec5f28f98323e66b3230966 | |
| parent | b441ef3a4f5e15d55139ca10af0b2d6209066b07 [diff] | |
| parent | 44fcfa5bfd6a5540e0c1efcc1b687b2e4a5f0849 [diff] |
Merge "Play fallback animation when overlay is shown." into sc-v2-dev am: 44fcfa5bfd Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16202910 Change-Id: I2d805b0b53dfcf4ca94debafca0d41ce3efb5c23
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());