| commit | b3b7da39f0f6a89c9fc1a7761bf61edbafe12949 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Wed Jun 02 00:23:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 02 00:23:56 2021 +0000 |
| tree | 591abe862482fcc47cf37a85603492ad8c05aab0 | |
| parent | d7a900643f4f83a7cfedd1eb6fe60cb59ce85b11 [diff] | |
| parent | b7e04f22eb9019ba2121dc6e6b10b75d94d86daa [diff] |
Merge "Fix duplicate depth animations when swiping from overview to home" into sc-dev am: 3cc2f46ca8 am: 7f1f42ffb0 am: b7e04f22eb Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14792890 Change-Id: I43422d631be7250f41d70565963366290f289714
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);