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

Commit 744bd2b0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bad rebase in ag/3577127."

parents 22f10c30 ba1442aa

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