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

Disable functional key while in sliding input mode

Browse source 
This change registers the functional key when sliding input mode is
end at the functional key itself.

Bug: 8915171
Change-Id: I2031e2aa4ebf33684221fc44d4a808112489724f
This commit is contained in:
Tadashi G. Takaoka 2013-05-13 17:19:21 +09:00
parent 0efd8d1b69
commit e3b1bdc4f1
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
java/src/com/android/inputmethod/keyboard/PointerTracker.java
View file

@ -1168,6 +1168,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
private void onUpEventInternal(final int x, final int y, final long eventTime) {
mTimerProxy.cancelKeyTimers();
final boolean isInSlidingKeyInput = mIsInSlidingKeyInput;
resetSlidingKeyInput();
mIsDetectingGesture = false;
final Key currentKey = mCurrentKey;
@ -1197,9 +1198,11 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
if (mIsTrackingForActionDisabled) {
return;
}
if (currentKey != null && !currentKey.isRepeatable()) {
detectAndSendKey(currentKey, mKeyX, mKeyY, eventTime);
if (currentKey != null && currentKey.isRepeatable() && !isInSlidingKeyInput) {
// Repeatable key has been registered in {@link #onDownEventInternal(int,int,long)}.
return;
}
detectAndSendKey(currentKey, mKeyX, mKeyY, eventTime);
}
public void onShowMoreKeysPanel(final int translatedX, final int translatedY,
@ -1251,7 +1254,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
if (key == null) return;
if (!key.isRepeatable()) return;
// Don't start key repeat when we are in sliding input mode.
if (mIsInSlidingKeyInputFromModifier) return;
if (mIsInSlidingKeyInput) return;
onRegisterKey(key);
mTimerProxy.startKeyRepeatTimer(this);
}
@ -1313,7 +1316,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
// doesn't have its more keys. (e.g. spacebar, globe key)
// We always need to start the long press timer if the key has its more keys regardless of
// whether or not we are in the sliding input mode.
if (mIsInSlidingKeyInputFromModifier && key.mMoreKeys == null) return;
if (mIsInSlidingKeyInput && key.mMoreKeys == null) return;
mTimerProxy.startLongPressTimer(this);
}