aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-08-23 00:19:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-23 00:19:48 -0700
commit014148aebda90bb29e813ac08215f3f2f9de3e03 (patch)
treef2179156475c7250a30c5b02e082b981e91b26db /java/src/com/android/inputmethod
parent308ceb89c76728890a34327181dc856d027906cc (diff)
parentb28139f51b2f2e6dfd60e968024006f53590a41c (diff)
downloadlatinime-014148aebda90bb29e813ac08215f3f2f9de3e03.tar.gz
latinime-014148aebda90bb29e813ac08215f3f2f9de3e03.tar.xz
latinime-014148aebda90bb29e813ac08215f3f2f9de3e03.zip
am b28139f5: Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
* commit 'b28139f51b2f2e6dfd60e968024006f53590a41c': Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/keyboard/PointerTracker.java5
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) {