aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-10-03 10:16:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-03 10:16:04 -0700
commit16c85695ee293f3756d01a267ff0851b8a675c2d (patch)
tree6e8afa512f06b1f5ea52a71d856340e1263ad325 /java/src
parent73575763f69018edd895d120be63fba551f0f5ab (diff)
parent400ec7c5a6cc483fe4064bfb0d5462d2ad2c694e (diff)
downloadlatinime-16c85695ee293f3756d01a267ff0851b8a675c2d.tar.gz
latinime-16c85695ee293f3756d01a267ff0851b8a675c2d.tar.xz
latinime-16c85695ee293f3756d01a267ff0851b8a675c2d.zip
am 400ec7c5: am 0938fb69: Allow gesture from the delete key
* commit '400ec7c5a6cc483fe4064bfb0d5462d2ad2c694e': Allow gesture from the delete key
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/PointerTracker.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index d4d0d8718..c71833211 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -937,9 +937,10 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
if (!sShouldHandleGesture) {
return;
}
- // A gesture should start only from a non-modifier key.
+ // A gesture should start only from a non-modifier key. Note that the gesture detection is
+ // disabled when the key is repeating.
mIsDetectingGesture = (mKeyboard != null) && mKeyboard.mId.isAlphabetKeyboard()
- && key != null && !key.isModifier() && !key.isRepeatable();
+ && key != null && !key.isModifier();
if (mIsDetectingGesture) {
if (getActivePointerTrackerCount() == 1) {
sGestureFirstDownTime = eventTime;
@@ -1422,6 +1423,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
if (key == null || key.getCode() != code) {
return;
}
+ mIsDetectingGesture = false;
final int nextRepeatCount = repeatCount + 1;
mTimerProxy.startKeyRepeatTimer(this, nextRepeatCount, sParams.mKeyRepeatInterval);
callListenerOnPressAndCheckKeyboardLayoutChange(key, repeatCount);