diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-06-26 03:16:12 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-06-26 03:16:12 -0700 |
| commit | 342ea3d324f0eb17fd70d8e0e23dc83beed25008 (patch) | |
| tree | eb169f1c7540efb75173c9086f21aa37e8935633 /java/src | |
| parent | a8c9946b44bef497050ddbfcdd134a19c0ebb5f3 (diff) | |
| parent | 3314d38dafc0b9670e695a194c74950c4ebf2b3d (diff) | |
| download | latinime-342ea3d324f0eb17fd70d8e0e23dc83beed25008.tar.gz latinime-342ea3d324f0eb17fd70d8e0e23dc83beed25008.tar.xz latinime-342ea3d324f0eb17fd70d8e0e23dc83beed25008.zip | |
Merge "Pass MotionEvent to PointerTracker"
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java | 5 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/PointerTracker.java | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java index e3739eb3c..8d634794c 100644 --- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java @@ -762,15 +762,18 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke final PointerTracker tracker = PointerTracker.getPointerTracker( pointerId, this); final int px, py; + final MotionEvent motionEvent; if (mMoreKeysPanel != null && tracker.mPointerId == mMoreKeysPanelPointerTrackerId) { px = mMoreKeysPanel.translateX((int)me.getX(i)); py = mMoreKeysPanel.translateY((int)me.getY(i)); + motionEvent = null; } else { px = (int)me.getX(i); py = (int)me.getY(i); + motionEvent = me; } - tracker.onMoveEvent(px, py, eventTime); + tracker.onMoveEvent(px, py, eventTime, motionEvent); if (ENABLE_USABILITY_STUDY_LOG) { final float pointerSize = me.getSize(i); final float pointerPressure = me.getPressure(i); diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index a61459835..91c103ab7 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -473,7 +473,7 @@ public class PointerTracker { onUpEvent(x, y, eventTime); break; case MotionEvent.ACTION_MOVE: - onMoveEvent(x, y, eventTime); + onMoveEvent(x, y, eventTime, null); break; case MotionEvent.ACTION_CANCEL: onCancelEvent(x, y, eventTime); @@ -553,7 +553,7 @@ public class PointerTracker { mIsInSlidingKeyInput = true; } - public void onMoveEvent(int x, int y, long eventTime) { + public void onMoveEvent(int x, int y, long eventTime, MotionEvent me) { if (DEBUG_MOVE_EVENT) printTouchEvent("onMoveEvent:", x, y, eventTime); if (mKeyAlreadyProcessed) |