Merge "Play fallback animation if there are multiple closing targets." into tm-dev am: 441a7d76ef

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17127939 Change-Id: I0f927b2f59bfb5a38187731b22f798ac92877b8a
2022-03-09 21:05:44 +00:00
parent 064cd357ba 441a7d76ef
commit 95cbde4ae3
1 changed files with 15 additions and 1 deletions
@@ -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;