nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit '400ec7c5a6cc483fe4064bfb0d5462d2ad2c694e':
  Allow gesture from the delete key
main
Satoshi Kataoka 2013-10-03 10:16:04 -07:00 committed by Android Git Automerger
parent 73575763f6 400ec7c5a6
commit 16c85695ee
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/com/android/inputmethod/keyboard/PointerTracker.java
View File

@ -937,9 +937,10 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
if (!sShouldHandleGesture) { if (!sShouldHandleGesture) {
return; 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() mIsDetectingGesture = (mKeyboard != null) && mKeyboard.mId.isAlphabetKeyboard()
&& key != null && !key.isModifier() && !key.isRepeatable(); && key != null && !key.isModifier();
if (mIsDetectingGesture) { if (mIsDetectingGesture) {
if (getActivePointerTrackerCount() == 1) { if (getActivePointerTrackerCount() == 1) {
sGestureFirstDownTime = eventTime; sGestureFirstDownTime = eventTime;
@ -1422,6 +1423,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
if (key == null || key.getCode() != code) { if (key == null || key.getCode() != code) {
return; return;
} }
mIsDetectingGesture = false;
final int nextRepeatCount = repeatCount + 1; final int nextRepeatCount = repeatCount + 1;
mTimerProxy.startKeyRepeatTimer(this, nextRepeatCount, sParams.mKeyRepeatInterval); mTimerProxy.startKeyRepeatTimer(this, nextRepeatCount, sParams.mKeyRepeatInterval);
callListenerOnPressAndCheckKeyboardLayoutChange(key, repeatCount); callListenerOnPressAndCheckKeyboardLayoutChange(key, repeatCount);