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

adamp · Android Git Automerger · commit b94451411bbd · 2012-08-31T11:27:31.000-07:00
* commit 'f1faf7743f39f56cc57d6f2a520e5c8ecf4e58b5':
  DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
diff --git a/core/java/android/view/GestureDetector.java b/core/java/android/view/GestureDetector.java
@@ -453,7 +453,8 @@ public boolean onTouchEvent(MotionEvent 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;
 
         // Determine focal point

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,8 @@ public boolean onTouchEvent(MotionEvent ev) {`
`453`	`453`	`}`
`454`	`454`	`mVelocityTracker.addMovement(ev);`
`455`	`455`
`456`		`- final boolean pointerUp = action == MotionEvent.ACTION_POINTER_UP;`
	`456`	`+ final boolean pointerUp =`
	`457`	`+ (action & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_UP;`
`457`	`458`	`final int skipIndex = pointerUp ? ev.getActionIndex() : -1;`
`458`	`459`
`459`	`460`	`// Determine focal point`