commit e76484721e5b7bd7c2f11a97f04440434b5a66ee
author Craig Mautner <cmautner@google.com> Wed Nov 26 17:26:45 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 26 17:26:47 2014 +0000
tree 7078155ad85b8766802b2908f57262e53cbb57ad
parent 564ec716f4ac2f71d7d4e6eb481075603e183b4f
parent f2ad1a442bd85bd6ae0c5fd47701ec7dfa91c1f9

Merge "Measure absolute value of pointer motion distance"

services/core/java/com/android/server/wm/StackTapPointerEventListener.java

diff --git a/services/core/java/com/android/server/wm/StackTapPointerEventListener.java b/services/core/java/com/android/server/wm/StackTapPointerEventListener.java
index 19d8ab3..7573400 100644
--- a/services/core/java/com/android/server/wm/StackTapPointerEventListener.java
+++ b/services/core/java/com/android/server/wm/StackTapPointerEventListener.java
@@ -57,8 +57,8 @@
                 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 @@
                     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();