summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/allapps
diff options
context:
space:
mode:
authorTony <twickham@google.com>2017-07-05 10:36:33 -0700
committerTony <twickham@google.com>2017-07-05 10:36:33 -0700
commit200352ca4e9199265ff3d28c281bdbf905983e83 (patch)
tree775ae117b8ce071a80b777195f193c0df80c6b7f /src/com/android/launcher3/allapps
parentf593fb916e1da8f218b265ba4a752b31cf3b2fb6 (diff)
downloadandroid_packages_apps_Trebuchet-200352ca4e9199265ff3d28c281bdbf905983e83.tar.gz
android_packages_apps_Trebuchet-200352ca4e9199265ff3d28c281bdbf905983e83.tar.bz2
android_packages_apps_Trebuchet-200352ca4e9199265ff3d28c281bdbf905983e83.zip
Don't enter overscroll when dragging fast scrollbar.
Bug: 63298293 Change-Id: Id3a6551df265c5a92ce5da6509fdac60fb44fcb7
Diffstat (limited to 'src/com/android/launcher3/allapps')
-rw-r--r--src/com/android/launcher3/allapps/AllAppsRecyclerView.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
index 34421bdac..ff8de88eb 100644
--- a/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsRecyclerView.java
@@ -495,7 +495,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
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);