nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Second finger can start gesture input" into jb-mr1-dev

main
Tadashi G. Takaoka 2012-09-24 00:12:53 -07:00 committed by Android (Google) Code Review
parent 65ef26081b b305e6775a
commit b760591040
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java/src/com/android/inputmethod/keyboard/PointerTracker.java
View File

@ -685,18 +685,13 @@ public class PointerTracker implements PointerTrackerQueue.Element {
if (!sShouldHandleGesture) { if (!sShouldHandleGesture) {
return; return;
} }
final int activePointerTrackerCount = getActivePointerTrackerCount();
if (activePointerTrackerCount == 1) {
mIsDetectingGesture = false;
// A gesture should start only from the letter key. // A gesture should start only from the letter key.
final boolean isAlphabetKeyboard = (mKeyboard != null) mIsDetectingGesture = (mKeyboard != null) && mKeyboard.mId.isAlphabetKeyboard()
&& mKeyboard.mId.isAlphabetKeyboard(); && !mIsShowingMoreKeysPanel && key != null && Keyboard.isLetterCode(key.mCode);
if (isAlphabetKeyboard && !mIsShowingMoreKeysPanel && key != null if (mIsDetectingGesture) {
&& Keyboard.isLetterCode(key.mCode)) { if (getActivePointerTrackerCount() == 1) {
sGestureFirstDownTime = eventTime; sGestureFirstDownTime = eventTime;
onGestureDownEvent(x, y, eventTime);
} }
} else if (sInGesture && activePointerTrackerCount > 1) {
onGestureDownEvent(x, y, eventTime); onGestureDownEvent(x, y, eventTime);
} }
} }