Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bad rebase in ag/3577127.

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

Bug: 70799330
Test: visual
Change-Id: I3779e9a07724132c609182b60a6748c359f5fe3b
This commit is contained in:
Amin Shaikh
2018-02-08 13:17:48 -05:00
parent b6276fe5a3
commit ba1442aaf4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java
View File

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