Merge "Disable gesture input detection when more keys keyboard is showing"

This commit is contained in:
Tadashi G. Takaoka 2012-07-20 03:28:51 -07:00 committed by Android (Google) Code Review
commit 2474b37abd

View file

@ -669,7 +669,7 @@ public class PointerTracker {
if (queue != null && queue.size() == 1) {
mIsPossibleGesture = false;
// A gesture should start only from the letter key.
if (sIsGestureEnabled && mIsAlphabetKeyboard && key != null
if (sIsGestureEnabled && mIsAlphabetKeyboard && !mIsShowingMoreKeysPanel && key != null
&& Keyboard.isLetterCode(key.mCode)) {
mIsPossibleGesture = true;
// TODO: pointer times should be relative to first down even in entire batch input
@ -913,8 +913,8 @@ public class PointerTracker {
public void onShowMoreKeysPanel(int x, int y, KeyEventHandler handler) {
abortBatchInput();
onLongPressed();
onDownEvent(x, y, SystemClock.uptimeMillis(), handler);
mIsShowingMoreKeysPanel = true;
onDownEvent(x, y, SystemClock.uptimeMillis(), handler);
}
public void onLongPressed() {