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

Commit 35742d8c authored by Jason Monk's avatar Jason Monk
Browse files

QS: Followup to scroll fixes 

Change-Id: Icfa8f9e7c2cc563dd1496049b82e4cdb4c4fc922
Fixes: 28671167
parent ce289e93

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

+1 −10
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ import android.widget.ScrollView; 
 */

 */

public class NonInterceptingScrollView extends ScrollView {

public class NonInterceptingScrollView extends ScrollView {





    private float mInitialY;



    public NonInterceptingScrollView(Context context, AttributeSet attrs) {

    public NonInterceptingScrollView(Context context, AttributeSet attrs) {

        super(context, attrs);

        super(context, attrs);

    }

    }
@@ -35,14 +33,7 @@ public class NonInterceptingScrollView extends ScrollView { 
        int action = ev.getActionMasked();

        int action = ev.getActionMasked();

        switch (action) {

        switch (action) {

            case MotionEvent.ACTION_DOWN:

            case MotionEvent.ACTION_DOWN:

                mInitialY = ev.getY();

                if (canScrollVertically(1)) {

                break;

            case MotionEvent.ACTION_UP:

            case MotionEvent.ACTION_CANCEL:

                requestDisallowInterceptTouchEvent(false);

                break;

            default:

                if (canScrollVertically(ev.getY() > mInitialY ? -1 : 1)) {

                    requestDisallowInterceptTouchEvent(true);

                    requestDisallowInterceptTouchEvent(true);

                }

                }

                break;

                break;