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

Commit f1faf774 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP" into jb-dev

parents 6fdd4963 39263601

core/java/android/view/GestureDetector.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -453,7 +453,8 @@ public class GestureDetector { 
        }

        }

        mVelocityTracker.addMovement(ev);

        mVelocityTracker.addMovement(ev);





        final boolean pointerUp = action == MotionEvent.ACTION_POINTER_UP;

        final boolean pointerUp =

                (action & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_UP;

        final int skipIndex = pointerUp ? ev.getActionIndex() : -1;

        final int skipIndex = pointerUp ? ev.getActionIndex() : -1;





        // Determine focal point

        // Determine focal point