aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-09-14 10:29:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-14 10:29:46 -0700
commit49f038710318ef379e7465da3da4bf9d391a9989 (patch)
treeff02b2e22476b4c4e1bfbd5457008d4513016d07
parent2132c6d85e107443184e649436fa7ca4d805cdf3 (diff)
parent6456aabb09a66cef407e777b66ac19548e2c635d (diff)
downloadlatinime-49f038710318ef379e7465da3da4bf9d391a9989.tar.gz
latinime-49f038710318ef379e7465da3da4bf9d391a9989.tar.xz
latinime-49f038710318ef379e7465da3da4bf9d391a9989.zip
am 6456aabb: am c869a224: Merge "Don\'t show gesture preview trail while detecting gesture input" into jb-mr1-dev
* commit '6456aabb09a66cef407e777b66ac19548e2c635d': Don't show gesture preview trail while detecting gesture input
-rw-r--r--java/src/com/android/inputmethod/keyboard/PointerTracker.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 2417d6e96..a6439c46a 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -545,13 +545,14 @@ public class PointerTracker implements PointerTrackerQueue.Element {
}
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);
}