commit 505b4b2d8fcc3056864a80086970f9adebd85d37
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 09 11:56:28 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 09 11:56:28 2021 +0000
tree 8fdb9111c2eff2d607e6729be9b43634cacf24cc
parent 3c08f580c3583d6ed453fe15958d687acff317b6
parent 45fc68118045243c292a1fd3af6744165223fde1

Merge "Use ACCEL_DEACCEL when swiping up to enter grid" into sc-dev

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

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