commit b7e04f22eb9019ba2121dc6e6b10b75d94d86daa
author Tony Wickham <twickham@google.com> Wed Jun 02 00:00:53 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 02 00:00:53 2021 +0000
tree 610937b0b2ad4a8b3e87ba74f0401f8bbbc1d390
parent 03069852c4c5ead543ad1a90fa97e0bbfce6685b
parent 7f1f42ffb037de8253ee4178310a8abcb21b2bfb

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

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

Change-Id: If4a30ca04e75906c1a3a469c20e672f2547937dc

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

diff --git a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
index badb41a..5cf4f0b 100644
--- a/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
+++ b/quickstep/src/com/android/quickstep/util/OverviewToHomeAnim.java
@@ -78,6 +78,10 @@
         }
 
         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);