drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Powell
2012-08-31 11:24:30 -07:00
committed by Android (Google) Code Review
parent 6fdd496308 39263601cc
commit f1faf7743f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/GestureDetector.java
View File

@ -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