diff options
| author | Tony Wickham <twickham@google.com> | 2017-07-05 17:49:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-05 17:49:57 +0000 |
| commit | 35005ef213aa1e52fbffad9af61e1c1973e557d9 (patch) | |
| tree | 294578f6935b935eabe7ca33a0169a55d0a8e035 /src/com/android/launcher3/allapps | |
| parent | c3f76644757394921aeeb92b90dbb9b553fbe2c5 (diff) | |
| parent | 200352ca4e9199265ff3d28c281bdbf905983e83 (diff) | |
| download | android_packages_apps_Trebuchet-35005ef213aa1e52fbffad9af61e1c1973e557d9.tar.gz android_packages_apps_Trebuchet-35005ef213aa1e52fbffad9af61e1c1973e557d9.tar.bz2 android_packages_apps_Trebuchet-35005ef213aa1e52fbffad9af61e1c1973e557d9.zip | |
Merge "Don't enter overscroll when dragging fast scrollbar." into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3/allapps')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsRecyclerView.java | 3 |
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); |