Merge "Make scrollbar draggable only when it's visible." into nyc-dev

1 files changed, 3 insertions, 0 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 5ae426c24733..9e9ad677328c 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10903,6 +10903,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
                     return true;
                 }
             case MotionEvent.ACTION_DOWN:
+                if (mScrollCache.state == ScrollabilityCache.OFF) {
+                    return false;
+                }
                 if (isOnVerticalScrollbarThumb(x, y)) {
                     mScrollCache.mScrollBarDraggingState =
                             ScrollabilityCache.DRAGGING_VERTICAL_SCROLL_BAR;