am f224941c: Merge "Suppress calling onPressKey and onReleaseKey while detecting gesture"

* commit 'f224941c37a04d3c290ef2db5003a5af2a701fce':
  Suppress calling onPressKey and onReleaseKey while detecting gesture
main
Tadashi G. Takaoka 2013-04-14 23:20:52 -07:00 committed by Android Git Automerger
commit eabb710b60
1 changed files with 2 additions and 2 deletions

View File

@ -441,7 +441,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
// Returns true if keyboard has been changed by this callback.
private boolean callListenerOnPressAndCheckKeyboardLayoutChange(final Key key) {
if (sInGesture) {
if (sInGesture || mIsDetectingGesture) {
return false;
}
final boolean ignoreModifierKey = mIsInSlidingKeyInputFromModifier && key.isModifier();
@ -500,7 +500,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element {
// primaryCode is different from {@link Key#mCode}.
private void callListenerOnRelease(final Key key, final int primaryCode,
final boolean withSliding) {
if (sInGesture) {
if (sInGesture || mIsDetectingGesture) {
return;
}
final boolean ignoreModifierKey = mIsInSlidingKeyInputFromModifier && key.isModifier();