Merge "Disable gesture input detection when more keys keyboard is showing"
This commit is contained in:
commit
2474b37abd
1 changed files with 2 additions and 2 deletions
|
@ -669,7 +669,7 @@ public class PointerTracker {
|
||||||
if (queue != null && queue.size() == 1) {
|
if (queue != null && queue.size() == 1) {
|
||||||
mIsPossibleGesture = false;
|
mIsPossibleGesture = false;
|
||||||
// A gesture should start only from the letter key.
|
// A gesture should start only from the letter key.
|
||||||
if (sIsGestureEnabled && mIsAlphabetKeyboard && key != null
|
if (sIsGestureEnabled && mIsAlphabetKeyboard && !mIsShowingMoreKeysPanel && key != null
|
||||||
&& Keyboard.isLetterCode(key.mCode)) {
|
&& Keyboard.isLetterCode(key.mCode)) {
|
||||||
mIsPossibleGesture = true;
|
mIsPossibleGesture = true;
|
||||||
// TODO: pointer times should be relative to first down even in entire batch input
|
// 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) {
|
public void onShowMoreKeysPanel(int x, int y, KeyEventHandler handler) {
|
||||||
abortBatchInput();
|
abortBatchInput();
|
||||||
onLongPressed();
|
onLongPressed();
|
||||||
onDownEvent(x, y, SystemClock.uptimeMillis(), handler);
|
|
||||||
mIsShowingMoreKeysPanel = true;
|
mIsShowingMoreKeysPanel = true;
|
||||||
|
onDownEvent(x, y, SystemClock.uptimeMillis(), handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onLongPressed() {
|
public void onLongPressed() {
|
||||||
|
|
Loading…
Reference in a new issue