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

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

View File

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