commit 35742d8c31d4a8cfe3d21ab51ddcddfa642c1d9a
author Jason Monk <jmonk@google.com> Tue May 31 10:30:46 2016 -0400
committer Jason Monk <jmonk@google.com> Tue May 31 10:30:46 2016 -0400
tree cc6fd023c5239f65483b54a69a8264f5ff281f96
parent ce289e937ee6b001cd14824e5dec3c6010b51e61

QS: Followup to scroll fixes

Change-Id: Icfa8f9e7c2cc563dd1496049b82e4cdb4c4fc922
Fixes: 28671167

packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java b/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java
index 15e1c96..c204d94 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java
@@ -24,8 +24,6 @@
  */
 public class NonInterceptingScrollView extends ScrollView {
 
-    private float mInitialY;
-
     public NonInterceptingScrollView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
@@ -35,14 +33,7 @@
         int action = ev.getActionMasked();
         switch (action) {
             case MotionEvent.ACTION_DOWN:
-                mInitialY = ev.getY();
-                break;
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
-                requestDisallowInterceptTouchEvent(false);
-                break;
-            default:
-                if (canScrollVertically(ev.getY() > mInitialY ? -1 : 1)) {
+                if (canScrollVertically(1)) {
                     requestDisallowInterceptTouchEvent(true);
                 }
                 break;