Merge "Postpone gesture start detection on non-letter key" into jb-mr1-dev

This commit is contained in:
Tadashi G. Takaoka 2012-09-25 22:49:35 -07:00 committed by Android (Google) Code Review
commit 1354910f7a

View file

@ -560,10 +560,13 @@ public class PointerTracker implements PointerTrackerQueue.Element {
return (sPointerTrackerQueue == null) ? 1 : sPointerTrackerQueue.size(); return (sPointerTrackerQueue == null) ? 1 : sPointerTrackerQueue.size();
} }
private void mayStartBatchInput() { private void mayStartBatchInput(final Key key) {
if (sInGesture || !mGestureStrokeWithPreviewPoints.isStartOfAGesture()) { if (sInGesture || !mGestureStrokeWithPreviewPoints.isStartOfAGesture()) {
return; return;
} }
if (key == null || !Character.isLetter(key.mCode)) {
return;
}
if (DEBUG_LISTENER) { if (DEBUG_LISTENER) {
Log.d(TAG, "onStartBatchInput"); Log.d(TAG, "onStartBatchInput");
} }
@ -742,7 +745,7 @@ public class PointerTracker implements PointerTrackerQueue.Element {
final int gestureTime = (int)(eventTime - sGestureFirstDownTime); final int gestureTime = (int)(eventTime - sGestureFirstDownTime);
if (mIsDetectingGesture) { if (mIsDetectingGesture) {
mGestureStrokeWithPreviewPoints.addPoint(x, y, gestureTime, isMajorEvent); mGestureStrokeWithPreviewPoints.addPoint(x, y, gestureTime, isMajorEvent);
mayStartBatchInput(); mayStartBatchInput(key);
if (sInGesture && key != null) { if (sInGesture && key != null) {
updateBatchInput(eventTime); updateBatchInput(eventTime);
} }