diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-08-23 00:21:36 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-23 00:21:36 -0700 |
| commit | f80df0ebdf240e77312c1c2e65a1aff6c7da7d8e (patch) | |
| tree | f2179156475c7250a30c5b02e082b981e91b26db /java/src | |
| parent | d9768e006e1872d8eb6716c4caf91395623d95bd (diff) | |
| parent | 014148aebda90bb29e813ac08215f3f2f9de3e03 (diff) | |
| download | latinime-f80df0ebdf240e77312c1c2e65a1aff6c7da7d8e.tar.gz latinime-f80df0ebdf240e77312c1c2e65a1aff6c7da7d8e.tar.xz latinime-f80df0ebdf240e77312c1c2e65a1aff6c7da7d8e.zip | |
am 014148ae: am b28139f5: Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
* commit '014148aebda90bb29e813ac08215f3f2f9de3e03':
Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/PointerTracker.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index ac1a28b05..751dd6061 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -819,8 +819,9 @@ public class PointerTracker implements PointerTrackerQueue.Element { // touch panels when there are close multiple touches. // Caveat: When in chording input mode with a modifier key, we don't use // this hack. - if (me != null && me.getPointerCount() > 1 - && !sPointerTrackerQueue.hasModifierKeyOlderThan(this)) { + final PointerTrackerQueue queue = sPointerTrackerQueue; + if (queue != null && queue.size() > 1 + && !queue.hasModifierKeyOlderThan(this)) { onUpEventInternal(); } if (!mIsPossibleGesture) { |