am e7648472: Merge "Measure absolute value of pointer motion distance"

* commit 'e76484721e5b7bd7c2f11a97f04440434b5a66ee':
  Measure absolute value of pointer motion distance
This commit is contained in:
Craig Mautner
2014-11-26 17:31:08 +00:00
committed by Android Git Automerger

View File

@@ -57,8 +57,8 @@ public class StackTapPointerEventListener implements PointerEventListener {
if (mPointerId >= 0) {
int index = motionEvent.findPointerIndex(mPointerId);
if ((motionEvent.getEventTime() - motionEvent.getDownTime()) > TAP_TIMEOUT_MSEC
|| (motionEvent.getX(index) - mDownX) > mMotionSlop
|| (motionEvent.getY(index) - mDownY) > mMotionSlop) {
|| Math.abs(motionEvent.getX(index) - mDownX) > mMotionSlop
|| Math.abs(motionEvent.getY(index) - mDownY) > mMotionSlop) {
mPointerId = -1;
}
}
@@ -73,7 +73,8 @@ public class StackTapPointerEventListener implements PointerEventListener {
final int y = (int)motionEvent.getY(index);
if ((motionEvent.getEventTime() - motionEvent.getDownTime())
< TAP_TIMEOUT_MSEC
&& (x - mDownX) < mMotionSlop && (y - mDownY) < mMotionSlop
&& Math.abs(x - mDownX) < mMotionSlop
&& Math.abs(y - mDownY) < mMotionSlop
&& !mTouchExcludeRegion.contains(x, y)) {
mService.mH.obtainMessage(H.TAP_OUTSIDE_STACK, x, y,
mDisplayContent).sendToTarget();