From 489c50726a55a0cccd5e77808ab8297deb5e25d7 Mon Sep 17 00:00:00 2001
From: Amin Shaikh <ashaikh@google.com>
Date: Fri, 2 Feb 2018 13:38:03 -0500
Subject: [PATCH] Ignore QS touches if scrolling is not possible.

Bug: 70799330
Test: manually scrolling up and down on QS
Change-Id: I932386898ab6259c7f726fcbb5935e8e3b1e1d0a
---
 .../com/android/systemui/qs/QSScrollLayout.java | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java b/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
index 9a747877d9be5..8e99afbb4d3da 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
@@ -49,6 +49,23 @@ public class QSScrollLayout extends NestedScrollView {
         addView(linearLayout);
     }
 
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if (canScrollVertically(1) || canScrollVertically(-1)) {
+            return super.onInterceptTouchEvent(ev);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (canScrollVertically(1) || canScrollVertically(-1)) {
+            return super.onTouchEvent(ev);
+        }
+        return false;
+    }
+
     public boolean shouldIntercept(MotionEvent ev) {
         getHitRect(mHitRect);
         if (!mHitRect.contains((int) ev.getX(), (int) ev.getY())) {