Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7605910 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

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

parents 65ef2608 b305e677

java/src/com/android/inputmethod/keyboard/PointerTracker.java

+5 −10
Original line number Diff line number Diff line
@@ -685,18 +685,13 @@ public class PointerTracker implements PointerTrackerQueue.Element { 
        if (!sShouldHandleGesture) {

            return;

        }

        final int activePointerTrackerCount = getActivePointerTrackerCount();

        if (activePointerTrackerCount == 1) {

            mIsDetectingGesture = false;

        // A gesture should start only from the letter key.

            final boolean isAlphabetKeyboard = (mKeyboard != null)

                    && mKeyboard.mId.isAlphabetKeyboard();

            if (isAlphabetKeyboard && !mIsShowingMoreKeysPanel && key != null

                    && Keyboard.isLetterCode(key.mCode)) {

        mIsDetectingGesture = (mKeyboard != null) && mKeyboard.mId.isAlphabetKeyboard()

                && !mIsShowingMoreKeysPanel && key != null && Keyboard.isLetterCode(key.mCode);

        if (mIsDetectingGesture) {

            if (getActivePointerTrackerCount() == 1) {

                sGestureFirstDownTime = eventTime;

                onGestureDownEvent(x, y, eventTime);

            }

        } else if (sInGesture && activePointerTrackerCount > 1) {

            onGestureDownEvent(x, y, eventTime);

        }

    }