am 5a885e85: Merge "Keep showing key preview even when keyboard has been changed"

* commit '5a885e85c2df89247ccdde50fe26ca46438727fb':
  Keep showing key preview even when keyboard has been changed
main
Tadashi G. Takaoka 2014-02-12 01:43:41 -08:00 committed by Android Git Automerger
commit 71a6277e87
1 changed files with 3 additions and 7 deletions

View File

@ -412,13 +412,9 @@ public final class PointerTracker implements PointerTrackerQueue.Element,
final int keyWidth = mKeyboard.mMostCommonKeyWidth; final int keyWidth = mKeyboard.mMostCommonKeyWidth;
final int keyHeight = mKeyboard.mMostCommonKeyHeight; final int keyHeight = mKeyboard.mMostCommonKeyHeight;
mBatchInputArbiter.setKeyboardGeometry(keyWidth, mKeyboard.mOccupiedHeight); mBatchInputArbiter.setKeyboardGeometry(keyWidth, mKeyboard.mOccupiedHeight);
final Key newKey = mKeyDetector.detectHitKey(mKeyX, mKeyY); // Keep {@link #mCurrentKey} that comes from previous keyboard. The key preview of
if (newKey != mCurrentKey) { // {@link #mCurrentKey} will be dismissed by {@setReleasedKeyGraphics(Key)} via
if (sDrawingProxy != null) { // {@link onMoveEventInternal(int,int,long)} or {@link #onUpEventInternal(int,int,long)}.
setReleasedKeyGraphics(mCurrentKey);
}
// Keep {@link #mCurrentKey} that comes from previous keyboard.
}
mPhantomSuddenMoveThreshold = (int)(keyWidth * PHANTOM_SUDDEN_MOVE_THRESHOLD); mPhantomSuddenMoveThreshold = (int)(keyWidth * PHANTOM_SUDDEN_MOVE_THRESHOLD);
mBogusMoveEventDetector.setKeyboardGeometry(keyWidth, keyHeight); mBogusMoveEventDetector.setKeyboardGeometry(keyWidth, keyHeight);
} }