commit 35005ef213aa1e52fbffad9af61e1c1973e557d9
author Tony Wickham <twickham@google.com> Wed Jul 05 17:49:57 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 05 17:49:57 2017 +0000
tree 294578f6935b935eabe7ca33a0169a55d0a8e035
parent c3f76644757394921aeeb92b90dbb9b553fbe2c5
parent 200352ca4e9199265ff3d28c281bdbf905983e83

Merge "Don't enter overscroll when dragging fast scrollbar." into ub-launcher3-dorval-polish

src/com/android/launcher3/allapps/AllAppsRecyclerView.java

diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 34421bd..ff8de88 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -495,7 +495,8 @@
         public boolean onDrag(float displacement, float velocity) {
             // We are in overscroll iff we are trying to drag further down when we're already at
             // the bottom of All Apps.
-            mIsInOverScroll = !canScrollVertically(1) && displacement < 0;
+            mIsInOverScroll = !canScrollVertically(1) && displacement < 0
+                    && !mScrollbar.isDraggingThumb();
 
             if (mIsInOverScroll) {
                 displacement = getDampedOverScroll(displacement);