diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-09-01 13:04:27 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 13:04:27 -0700 |
| commit | 568743e182d7a997714e494c801100701b5afd9f (patch) | |
| tree | c0c6c65ad8f74ff5f2935c02e9d6379961d3fa43 /java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java | |
| parent | a4c574585208d9b9d19cce3ad68f52a8143e2400 (diff) | |
| parent | 2c7583f6c3c24202492b9404955b1aee2dc5ce94 (diff) | |
| download | latinime-568743e182d7a997714e494c801100701b5afd9f.tar.gz latinime-568743e182d7a997714e494c801100701b5afd9f.tar.xz latinime-568743e182d7a997714e494c801100701b5afd9f.zip | |
am 2c7583f6: am c6cb2ec1: Add new public attribute mPointerId to PointerTracker
Merge commit '2c7583f6c3c24202492b9404955b1aee2dc5ce94'
* commit '2c7583f6c3c24202492b9404955b1aee2dc5ce94':
Add new public attribute mPointerId to PointerTracker
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java index 9ebab256d..4daf6515f 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java @@ -774,7 +774,6 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener, if (DEBUG) { if (mShowTouchPoints) { for (PointerTracker tracker : mPointerTrackers) { - if (tracker == null) continue; int startX = tracker.getStartX(); int startY = tracker.getStartY(); int lastX = tracker.getLastX(); @@ -1047,7 +1046,7 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener, // Create pointer trackers until we can get 'id+1'-th tracker, if needed. for (int i = pointers.size(); i <= id; i++) { final PointerTracker tracker = - new PointerTracker(mHandler, mKeyDetector, this); + new PointerTracker(i, mHandler, mKeyDetector, this); if (keys != null) tracker.setKeyboard(keys, mDebounceHysteresis); if (listener != null) |