summaryrefslogtreecommitdiff
path: root/core/java/android/view/MotionEvent.java
diff options
context:
space:
mode:
authorHuahui Wu <hwu@google.com>2011-01-24 12:07:37 -0800
committerHuahui Wu <hwu@google.com>2011-01-24 12:07:37 -0800
commitf93246923f0a8c85fddb508533d63d59977f75eb (patch)
treee8e9764d83bcd55892ba650bd82cb4e3489f3de2 /core/java/android/view/MotionEvent.java
parentda6f9295840b0e74f61afa273ce2a767d8148af7 (diff)
A few small cleanning-ups.
1. Remove mDeferMultiTouch in WebView, it was for testing only but we don't need it now since we always pass MultiTouch to WebKit. 2. Remove the use of mDeferMultiTouch in DRT tests. 3. Correct the index of getX(Y) for the second touch point in the debug string of MotionEvent. Change-Id: Ib63cfc5935af1a169ed26b2b138f74908492bc18
Diffstat (limited to 'core/java/android/view/MotionEvent.java')
-rw-r--r--core/java/android/view/MotionEvent.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java
index db2cd5056252..b95de64aa4df 100644
--- a/core/java/android/view/MotionEvent.java
+++ b/core/java/android/view/MotionEvent.java
@@ -1569,7 +1569,7 @@ public final class MotionEvent extends InputEvent implements Parcelable {
+ " device=" + mDeviceId
+ " source=0x" + Integer.toHexString(mSource)
+ (getPointerCount() > 1 ?
- " pointerId2=" + getPointerId(1) + " x2=" + getX(2) + " y2=" + getY(2) : "")
+ " pointerId2=" + getPointerId(1) + " x2=" + getX(1) + " y2=" + getY(1) : "")
+ "}";
}