Merge "Don't show gesture preview trail while detecting gesture input" into jb-mr1-dev
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 2417d6e..a6439c4 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -545,13 +545,14 @@
}
private void startBatchInput() {
- if (!sInGesture && mGestureStrokeWithPreviewTrail.isStartOfAGesture()) {
- if (DEBUG_LISTENER) {
- Log.d(TAG, "onStartBatchInput");
- }
- sInGesture = true;
- mListener.onStartBatchInput();
+ if (sInGesture || !mGestureStrokeWithPreviewTrail.isStartOfAGesture()) {
+ return;
}
+ if (DEBUG_LISTENER) {
+ Log.d(TAG, "onStartBatchInput");
+ }
+ sInGesture = true;
+ mListener.onStartBatchInput();
final boolean isOldestTracker = sPointerTrackerQueue.getOldestElement() == this;
mDrawingProxy.showGesturePreviewTrail(this, isOldestTracker);
}