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

am 0a9ea46c: am 0d098c51: Fix bugs in key repeat logic 

Merge commit '0a9ea46c2a8a438de13016d60ceccb96f81eb4d5'

* commit '0a9ea46c2a8a438de13016d60ceccb96f81eb4d5':
  Fix bugs in key repeat logic
main
Tadashi G. Takaoka 2010-08-25 20:08:28 -07:00 committed by Android Git Automerger
parent e724b4a62b 0a9ea46c2a
commit 04b5c5cd56
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
View File

@ -1313,13 +1313,14 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener
}
if (mHandler.isInKeyRepeat()) {
// Will keep being in the key repeating mode while the key is being pressed. It'll be
// canceled otherwise.
if (pointerCount == 1 && action == MotionEvent.ACTION_MOVE) {
return true;
} else {
// It'll be canceled if 2 or more keys are in action. Otherwise it will keep being in
// the key repeating mode while the key is being pressed.
if (pointerCount > 1) {
mHandler.cancelKeyRepeatTimer();
} else if (action == MotionEvent.ACTION_MOVE) {
return true;
}
// Up event will pass through.
}
if (pointerCount != mOldPointerCount) {
@ -1415,6 +1416,7 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener
break;
case MotionEvent.ACTION_UP:
boolean wasInKeyRepeat = mHandler.isInKeyRepeat();
mHandler.cancelKeyTimers();
mHandler.cancelPopupPreview();
if (mDebouncer.isMinorMoveBounce(touchX, touchY, keyIndex, mCurrentKey)) {
@ -1431,7 +1433,7 @@ public class LatinKeyboardBaseView extends View implements View.OnClickListener
}
showPreview(NOT_A_KEY);
// If we're not on a repeating key (which sends on a DOWN event)
if (!mMiniKeyboardOnScreen && !mAbortKey) {
if (!wasInKeyRepeat && !mMiniKeyboardOnScreen && !mAbortKey) {
detectAndSendKey(mCurrentKey, touchX, touchY, eventTime);
}
invalidateKey(keyIndex);