am 014148ae: am b28139f5: Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount

* commit '014148aebda90bb29e813ac08215f3f2f9de3e03':
  Use PointerTrackerQueue.size instead of MotionEvent.getPointerCount
main
Tadashi G. Takaoka 2012-08-23 00:21:36 -07:00 committed by Android Git Automerger
commit f80df0ebdf
1 changed files with 3 additions and 2 deletions

View File

@ -819,8 +819,9 @@ public class PointerTracker implements PointerTrackerQueue.Element {
// touch panels when there are close multiple touches. // touch panels when there are close multiple touches.
// Caveat: When in chording input mode with a modifier key, we don't use // Caveat: When in chording input mode with a modifier key, we don't use
// this hack. // this hack.
if (me != null && me.getPointerCount() > 1 final PointerTrackerQueue queue = sPointerTrackerQueue;
&& !sPointerTrackerQueue.hasModifierKeyOlderThan(this)) { if (queue != null && queue.size() > 1
&& !queue.hasModifierKeyOlderThan(this)) {
onUpEventInternal(); onUpEventInternal();
} }
if (!mIsPossibleGesture) { if (!mIsPossibleGesture) {