commit 8efc7c962d6793867fce07993a7b6bbd470dca41
author Tony Wickham <twickham@google.com> Tue Jun 01 23:38:07 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 01 23:38:07 2021 +0000
tree a6f62b90d6627c4c218ac5e5ad80ec9de6d834ff
parent 2d5cca31a756d2ebba6ec670e0b52023df5b73b9
parent 3cc2f46ca8a45fa172864c1c6bac01055713cfa9

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

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