commit a80180bfcb22e0e88ee09df66335fa7292e5c7f9
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 23 21:53:06 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 23 21:53:06 2019 +0000
tree 12f13105893d3c72c464f6ff983972cdfe076640
parent d2f793f77db1869170917111f3b178a4d376f1ac
parent 9b832295c30a352be52922b3d542d6d7518aa93d

Merge "Set scroller to new max duration if snapping too slowly" into ub-launcher3-qt-dev

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
index bbc6eb3..a1bcb9b 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -936,8 +936,10 @@
         } else if (endTarget == RECENTS) {
             mLiveTileOverlay.startIconAnimation();
             if (mRecentsView != null) {
-                duration = Utilities.boundToRange(mRecentsView.getScroller().getDuration(),
-                        duration, MAX_SWIPE_DURATION);
+                if (mRecentsView.getScroller().getDuration() > MAX_SWIPE_DURATION) {
+                    mRecentsView.snapToPage(mRecentsView.getNextPage(), (int) MAX_SWIPE_DURATION);
+                }
+                duration = Math.max(duration, mRecentsView.getScroller().getDuration());
             }
             if (mMode == Mode.NO_BUTTON) {
                 setShelfState(ShelfAnimState.OVERVIEW, interpolator, duration);