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

Commit 790d3403 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents" 

* commit 'd86bebb4':
  Protecting more views from (bad) MotionEvents
parents 2a4aaf13 d86bebb4

core/java/android/widget/HorizontalScrollView.java

+13 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.graphics.Canvas; 
import android.graphics.Rect;

import android.os.Bundle;

import android.util.AttributeSet;

import android.util.Log;

import android.view.FocusFinder;

import android.view.InputDevice;

import android.view.KeyEvent;
@@ -62,6 +63,7 @@ public class HorizontalScrollView extends FrameLayout { 


    private static final float MAX_SCROLL_FACTOR = ScrollView.MAX_SCROLL_FACTOR;



    private static final String TAG = "HorizontalScrollView";



    private long mLastScroll;
@@ -456,6 +458,12 @@ public class HorizontalScrollView extends FrameLayout { 
                }



                final int pointerIndex = ev.findPointerIndex(activePointerId);

                if (pointerIndex == -1) {

                    Log.e(TAG, "Invalid pointerId=" + activePointerId

                            + " in onInterceptTouchEvent");

                    break;

                }



                final int x = (int) ev.getX(pointerIndex);

                final int xDiff = (int) Math.abs(x - mLastMotionX);

                if (xDiff > mTouchSlop) {
@@ -557,6 +565,11 @@ public class HorizontalScrollView extends FrameLayout { 
            }

            case MotionEvent.ACTION_MOVE:

                final int activePointerIndex = ev.findPointerIndex(mActivePointerId);

                if (activePointerIndex == -1) {

                    Log.e(TAG, "Invalid pointerId=" + mActivePointerId + " in onTouchEvent");

                    break;

                }



                final int x = (int) ev.getX(activePointerIndex);

                int deltaX = mLastMotionX - x;

                if (!mIsBeingDragged && Math.abs(deltaX) > mTouchSlop) {

core/java/android/widget/ScrollView.java

+14 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.graphics.Rect; 
import android.os.Bundle;

import android.os.StrictMode;

import android.util.AttributeSet;

import android.util.Log;

import android.view.FocusFinder;

import android.view.InputDevice;

import android.view.KeyEvent;
@@ -69,6 +70,8 @@ public class ScrollView extends FrameLayout { 


    static final float MAX_SCROLL_FACTOR = 0.5f;



    private static final String TAG = "ScrollView";



    private long mLastScroll;



    private final Rect mTempRect = new Rect();
@@ -478,6 +481,12 @@ public class ScrollView extends FrameLayout { 
                }



                final int pointerIndex = ev.findPointerIndex(activePointerId);

                if (pointerIndex == -1) {

                    Log.e(TAG, "Invalid pointerId=" + activePointerId

                            + " in onInterceptTouchEvent");

                    break;

                }



                final int y = (int) ev.getY(pointerIndex);

                final int yDiff = Math.abs(y - mLastMotionY);

                if (yDiff > mTouchSlop) {
@@ -585,6 +594,11 @@ public class ScrollView extends FrameLayout { 
            }

            case MotionEvent.ACTION_MOVE:

                final int activePointerIndex = ev.findPointerIndex(mActivePointerId);

                if (activePointerIndex == -1) {

                    Log.e(TAG, "Invalid pointerId=" + mActivePointerId + " in onTouchEvent");

                    break;

                }



                final int y = (int) ev.getY(activePointerIndex);

                int deltaY = mLastMotionY - y;

                if (!mIsBeingDragged && Math.abs(deltaY) > mTouchSlop) {