From 5de3baa2ded2792d8a1f53f54fadbd5dd510b0c3 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Mon, 22 Jun 2020 09:51:34 -0700
Subject: [PATCH] Don't intercept touches when the qs scrollview can't scroll

This could lead to users not being able to collapse.

Fixes: 159420191
Test: expand qs, try to collapse from the 3 dot region
Change-Id: Iaa19e607919615777e5b21bbbd6325b6794b710a
---
 .../com/android/systemui/qs/NonInterceptingScrollView.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java b/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java
index aa17c4aa79b1d..309b32fc85d2a 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/NonInterceptingScrollView.java
@@ -46,6 +46,11 @@ public class NonInterceptingScrollView extends ScrollView {
                     if (parent != null) {
                         parent.requestDisallowInterceptTouchEvent(true);
                     }
+                } else if (!canScrollVertically(-1)) {
+                    // Don't pass on the touch to the view, because scrolling will unconditionally
+                    // disallow interception even if we can't scroll.
+                    // if a user can't scroll at all, we should never listen to the touch.
+                    return false;
                 }
                 break;
         }