aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2012-07-20 03:28:51 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-20 03:28:52 -0700
commit2474b37abd315f5d8123f5145393de00ccf3a547 (patch)
tree5caea3230514473a6c81fc9ce870b437309e210b /java/src
parent62b8dddb6ddb057555a1665759f9cf197e480c9f (diff)
parentcc3500b0c8f11e8de1ad7376dda466d30637e462 (diff)
downloadlatinime-2474b37abd315f5d8123f5145393de00ccf3a547.tar.gz
latinime-2474b37abd315f5d8123f5145393de00ccf3a547.tar.xz
latinime-2474b37abd315f5d8123f5145393de00ccf3a547.zip
Merge "Disable gesture input detection when more keys keyboard is showing"
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/PointerTracker.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index a4fccb2a2..1c84cb947 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -669,7 +669,7 @@ public class PointerTracker {
if (queue != null && queue.size() == 1) {
mIsPossibleGesture = false;
// A gesture should start only from the letter key.
- if (sIsGestureEnabled && mIsAlphabetKeyboard && key != null
+ if (sIsGestureEnabled && mIsAlphabetKeyboard && !mIsShowingMoreKeysPanel && key != null
&& Keyboard.isLetterCode(key.mCode)) {
mIsPossibleGesture = true;
// TODO: pointer times should be relative to first down even in entire batch input
@@ -913,8 +913,8 @@ public class PointerTracker {
public void onShowMoreKeysPanel(int x, int y, KeyEventHandler handler) {
abortBatchInput();
onLongPressed();
- onDownEvent(x, y, SystemClock.uptimeMillis(), handler);
mIsShowingMoreKeysPanel = true;
+ onDownEvent(x, y, SystemClock.uptimeMillis(), handler);
}
public void onLongPressed() {