diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java index 803dee4beb..8f8ac8e415 100644 --- a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java +++ b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java @@ -1186,6 +1186,19 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener return false; } + private boolean hasMultipleTargetsWithMode(RemoteAnimationTargetCompat[] targets, int mode) { + int numTargets = 0; + for (RemoteAnimationTargetCompat target : targets) { + if (target.mode == mode) { + numTargets++; + } + if (numTargets > 1) { + return true; + } + } + return false; + } + /** * @return Runner that plays when user goes to Launcher * ie. pressing home, swiping up from nav bar. @@ -1580,7 +1593,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener View launcherView = findLauncherView(appTargets); boolean playFallBackAnimation = (launcherView == null && launcherIsForceInvisibleOrOpening) - || mLauncher.getWorkspace().isOverlayShown(); + || mLauncher.getWorkspace().isOverlayShown() + || hasMultipleTargetsWithMode(appTargets, MODE_CLOSING); boolean playWorkspaceReveal = true; boolean skipAllAppsScale = false;