From ba1442aaf4d235f5cd2dc4dbb4cbcf8ce0b1d5fa Mon Sep 17 00:00:00 2001
From: Amin Shaikh <ashaikh@google.com>
Date: Thu, 8 Feb 2018 13:17:48 -0500
Subject: [PATCH] Fix bad rebase in ag/3577127.

Don't consume touch events in QSScrollLayout if the view cannot be
scrolled in either direction.

Bug: 70799330
Test: visual
Change-Id: I3779e9a07724132c609182b60a6748c359f5fe3b
---
 .../src/com/android/systemui/qs/QSScrollLayout.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java b/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
index b8f678413e915..7b1509dcd1739 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
@@ -65,8 +65,8 @@ public class QSScrollLayout extends NestedScrollView {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
-        if (canScrollVertically(1) || canScrollVertically(-1)) {
-            return super.onInterceptTouchEvent(ev);
+        if (!canScrollVertically(1) && !canScrollVertically(-1)) {
+            return false;
         }
         mSwipeDetector.onTouchEvent(ev);
         return super.onInterceptTouchEvent(ev) || mOverScrollHelper.isInOverScroll();
@@ -74,8 +74,8 @@ public class QSScrollLayout extends NestedScrollView {
 
     @Override
     public boolean onTouchEvent(MotionEvent ev) {
-        if (canScrollVertically(1) || canScrollVertically(-1)) {
-            return super.onTouchEvent(ev);
+        if (!canScrollVertically(1) && !canScrollVertically(-1)) {
+            return false;
         }
         mSwipeDetector.onTouchEvent(ev);
         return super.onTouchEvent(ev);