From 45fc68118045243c292a1fd3af6744165223fde1 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Mon, 8 Mar 2021 18:10:22 +0000 Subject: [PATCH] Use ACCEL_DEACCEL when swiping up to enter grid Bug: 174464863 Test: Test entering grid when swipe up on small and large screens Change-Id: I0799ef341b8344406de371501dc34a12ac8cbc6e --- quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 7f2af6b01c..e0c041eb9d 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java @@ -934,7 +934,9 @@ public abstract class AbsSwipeUpHandler, Q extends 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();