Merge "Second finger can start gesture input" into jb-mr1-dev
This commit is contained in:
commit
b760591040
1 changed files with 5 additions and 10 deletions
|
@ -685,18 +685,13 @@ public class PointerTracker implements PointerTrackerQueue.Element {
|
||||||
if (!sShouldHandleGesture) {
|
if (!sShouldHandleGesture) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final int activePointerTrackerCount = getActivePointerTrackerCount();
|
// A gesture should start only from the letter key.
|
||||||
if (activePointerTrackerCount == 1) {
|
mIsDetectingGesture = (mKeyboard != null) && mKeyboard.mId.isAlphabetKeyboard()
|
||||||
mIsDetectingGesture = false;
|
&& !mIsShowingMoreKeysPanel && key != null && Keyboard.isLetterCode(key.mCode);
|
||||||
// A gesture should start only from the letter key.
|
if (mIsDetectingGesture) {
|
||||||
final boolean isAlphabetKeyboard = (mKeyboard != null)
|
if (getActivePointerTrackerCount() == 1) {
|
||||||
&& mKeyboard.mId.isAlphabetKeyboard();
|
|
||||||
if (isAlphabetKeyboard && !mIsShowingMoreKeysPanel && key != null
|
|
||||||
&& Keyboard.isLetterCode(key.mCode)) {
|
|
||||||
sGestureFirstDownTime = eventTime;
|
sGestureFirstDownTime = eventTime;
|
||||||
onGestureDownEvent(x, y, eventTime);
|
|
||||||
}
|
}
|
||||||
} else if (sInGesture && activePointerTrackerCount > 1) {
|
|
||||||
onGestureDownEvent(x, y, eventTime);
|
onGestureDownEvent(x, y, eventTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue