commit 3cc2f46ca8a45fa172864c1c6bac01055713cfa9
author Tony Wickham <twickham@google.com> Tue Jun 01 23:17:36 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 01 23:17:36 2021 +0000
tree b87e0ff08cad1782908fcb6a3eb2418a20f1eecf
parent a357d6da6d43f3a38bb617dad8b39962f8a2dde1
parent 950388bf0e964e1f82ad90ff17ce0dc571e17d67

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

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);