Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba1442aa authored by Amin Shaikh's avatar Amin Shaikh
Browse files

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
parent b6276fe5

packages/SystemUI/src/com/android/systemui/qs/QSScrollLayout.java

+4 −4
Original line number Diff line number Diff line
@@ -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);