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);