| commit | 353484c82d12b5ca95baedbae5251a3a47d6ca7d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Mar 10 15:18:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 10 15:18:16 2021 +0000 |
| tree | 8fdb9111c2eff2d607e6729be9b43634cacf24cc | |
| parent | 5bcfb68c12f3166ea3a8f9afe53b55a9d4cf9743 [diff] | |
| parent | 505b4b2d8fcc3056864a80086970f9adebd85d37 [diff] |
Merge "Use ACCEL_DEACCEL when swiping up to enter grid" into sc-dev am: 505b4b2d8f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13790518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6cf35786084b7c8640417e77b480c6668ee02fd7
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 7f2af6b..e0c041e 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -934,7 +934,9 @@ duration = Math.min(MAX_SWIPE_DURATION, 2 * baseDuration); } } - Interpolator interpolator = endTarget == RECENTS ? OVERSHOOT_1_2 : DEACCEL; + Interpolator interpolator = + endTarget == RECENTS ? (mDp.isTablet && FeatureFlags.ENABLE_OVERVIEW_GRID.get() + ? ACCEL_DEACCEL : OVERSHOOT_1_2) : DEACCEL; if (endTarget.isLauncher) { mInputConsumerProxy.enable();