Merge "Fix duplicate depth animations when swiping from overview to home" into sc-dev am: 3cc2f46ca8

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

Change-Id: Iabb7d2dd2a403bb3ded20c2ff8acb8db0d68147b

quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java

@@ -78,6 +78,10 @@ public class OverviewToHomeAnim {
         }
 
         StateAnimationConfig config = new StateAnimationConfig();
+        if (playWorkspaceRevealAnim) {
+            // WorkspaceRevealAnim handles the depth, so don't interfere.
+            config.animFlags |= StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
+        }
         config.duration = startState.getTransitionDuration(mLauncher);
         AnimatorSet stateAnim = stateManager.createAtomicAnimation(
                 startState, NORMAL, config);