am 9dce586e: Bugfix: IME gives haptic feedback when button wasn\'t pressed

* commit '9dce586eaa8a99fac05da398694d6e26b2a6dfa8':
  Bugfix: IME gives haptic feedback when button wasn't pressed
main
Ken Wakasa 2010-10-28 11:36:40 -07:00 committed by Android Git Automerger
commit e32a77c691
1 changed files with 6 additions and 5 deletions

View File

@ -272,12 +272,13 @@ public class PointerTracker {
mIsRepeatableKey = false; mIsRepeatableKey = false;
checkMultiTap(eventTime, keyIndex); checkMultiTap(eventTime, keyIndex);
if (mListener != null) { if (mListener != null) {
int primaryCode = isValidKeyIndex(keyIndex) ? mKeys[keyIndex].codes[0] : 0; if (isValidKeyIndex(keyIndex)) {
mListener.onPress(primaryCode); mListener.onPress(mKeys[keyIndex].codes[0]);
// This onPress call may have changed keyboard layout and have updated mKeyIndex. // This onPress call may have changed keyboard layout and have updated mKeyIndex.
// If that's the case, mKeyIndex has been updated in setKeyboard(). // If that's the case, mKeyIndex has been updated in setKeyboard().
keyIndex = mKeyState.getKeyIndex(); keyIndex = mKeyState.getKeyIndex();
} }
}
if (isValidKeyIndex(keyIndex)) { if (isValidKeyIndex(keyIndex)) {
if (mKeys[keyIndex].repeatable) { if (mKeys[keyIndex].repeatable) {
repeatKey(keyIndex); repeatKey(keyIndex);