am 16c85695: am 400ec7c5: am 0938fb69: Allow gesture from the delete key

* commit '16c85695ee293f3756d01a267ff0851b8a675c2d':
  Allow gesture from the delete key
main
Satoshi Kataoka 2013-10-03 13:20:33 -07:00 committed by Android Git Automerger
commit e39df0b274
1 changed files with 4 additions and 2 deletions

View File

@ -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);