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

Commit 947ef9a7 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "QS: Followup to scroll fixes" into nyc-dev 

am: 1ceef7c0

* commit '1ceef7c0':
  QS: Followup to scroll fixes

Change-Id: I0d013329236b9c2ac1a6aa76fba20bcd7e79a4a1
parents 0c4f066f 1ceef7c0

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

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

public class NonInterceptingScrollView extends ScrollView {



    private float mInitialY;



    public NonInterceptingScrollView(Context context, AttributeSet attrs) {

        super(context, attrs);

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

        switch (action) {

            case MotionEvent.ACTION_DOWN:

                mInitialY = ev.getY();

                break;

            case MotionEvent.ACTION_UP:

            case MotionEvent.ACTION_CANCEL:

                requestDisallowInterceptTouchEvent(false);

                break;

            default:

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

                if (canScrollVertically(1)) {

                    requestDisallowInterceptTouchEvent(true);

                }

                break;