aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-04-15 06:19:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-15 06:19:10 +0000
commit1ec4c07a13447a98deca1fc9e79f5d507030695d (patch)
tree6f88002c8ecc7756321646611f5ab04a726f0dc6 /java/src
parentf224941c37a04d3c290ef2db5003a5af2a701fce (diff)
parent8dfbb740e1015af0cd339a183dd333a5f53c52c4 (diff)
downloadlatinime-1ec4c07a13447a98deca1fc9e79f5d507030695d.tar.gz
latinime-1ec4c07a13447a98deca1fc9e79f5d507030695d.tar.xz
latinime-1ec4c07a13447a98deca1fc9e79f5d507030695d.zip
Merge "Ignore modifier key while sliding key input"
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/PointerTracker.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index 2ec6e2049..91c4319e7 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -444,7 +444,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
if (sInGesture || mIsDetectingGesture) {
return false;
}
- final boolean ignoreModifierKey = mIsInSlidingKeyInputFromModifier && key.isModifier();
+ final boolean ignoreModifierKey = mIsInSlidingKeyInput && key.isModifier();
if (DEBUG_LISTENER) {
Log.d(TAG, String.format("[%d] onPress : %s%s%s", mPointerId,
KeyDetector.printableCode(key),
@@ -468,7 +468,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
// primaryCode is different from {@link Key#mCode}.
private void callListenerOnCodeInput(final Key key, final int primaryCode, final int x,
final int y, final long eventTime) {
- final boolean ignoreModifierKey = mIsInSlidingKeyInputFromModifier && key.isModifier();
+ final boolean ignoreModifierKey = mIsInSlidingKeyInput && key.isModifier();
final boolean altersCode = key.altCodeWhileTyping() && mTimerProxy.isTypingState();
final int code = altersCode ? key.getAltCode() : primaryCode;
if (DEBUG_LISTENER) {
@@ -503,7 +503,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
if (sInGesture || mIsDetectingGesture) {
return;
}
- final boolean ignoreModifierKey = mIsInSlidingKeyInputFromModifier && key.isModifier();
+ final boolean ignoreModifierKey = mIsInSlidingKeyInput && key.isModifier();
if (DEBUG_LISTENER) {
Log.d(TAG, String.format("[%d] onRelease : %s%s%s%s", mPointerId,
Constants.printableCode(primaryCode),