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

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

Merge "Fix KeyboardState to pass KeyboardStateMultiTouchTests"

parents 4d229410 d26d63b3

java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java

+5 −1
Original line number Diff line number Diff line
@@ -338,7 +338,11 @@ public class KeyboardState { 
            final boolean isShiftLocked = mAlphabetShiftState.isShiftLocked();

            if (mShiftKeyState.isMomentary()) {

                // After chording input while normal state.

                if (mAlphabetShiftState.isShiftLockShifted()) {

                    setShiftLocked(true);

                } else {

                    setShifted(SwitchActions.UNSHIFT);

                }

            } else if (isShiftLocked && !mAlphabetShiftState.isShiftLockShifted()

                    && (mShiftKeyState.isPressing() || mShiftKeyState.isPressingOnShifted())

                    && !withSliding) {

tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java

+11 −14
Original line number Diff line number Diff line
@@ -52,21 +52,18 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { 
        chordingPressAndReleaseKey('Z', ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED);

        chordingPressAndReleaseKey('X', ALPHABET_MANUAL_SHIFTED, ALPHABET_MANUAL_SHIFTED);



        // TODO: This test fails due to bug, though external behavior is correct.

//        // Release shift key, switch back to alphabet shift locked.

//        releaseKey(CODE_SHIFT, ALPHABET_SHIFT_LOCKED);

        releaseKey(CODE_SHIFT, ALPHABET_UNSHIFTED);

        // Release shift key, switch back to alphabet shift locked.

        releaseKey(CODE_SHIFT, ALPHABET_SHIFT_LOCKED);



        // TODO: This test fails due to bug, though external behavior is correct.

//        // Press symbols key and hold, enter into choring symbols state.

//        pressKey(CODE_SYMBOL, SYMBOLS_UNSHIFTED);

//

//        // Press/release symbol letter keys.

//        chordingPressAndReleaseKey('1', SYMBOLS_UNSHIFTED, SYMBOLS_UNSHIFTED);

//        chordingPressAndReleaseKey('2', SYMBOLS_UNSHIFTED, SYMBOLS_UNSHIFTED);

//

//        // Release symbols key, switch back to alphabet shift locked.

//        releaseKey(CODE_SYMBOL, ALPHABET_SHIFT_LOCKED);

        // Press symbols key and hold, enter into choring symbols state.

        pressKey(CODE_SYMBOL, SYMBOLS_UNSHIFTED);



        // Press/release symbol letter keys.

        chordingPressAndReleaseKey('1', SYMBOLS_UNSHIFTED, SYMBOLS_UNSHIFTED);

        chordingPressAndReleaseKey('2', SYMBOLS_UNSHIFTED, SYMBOLS_UNSHIFTED);



        // Release symbols key, switch back to alphabet shift locked.

        releaseKey(CODE_SYMBOL, ALPHABET_SHIFT_LOCKED);

    }



    // Symbols key chording input.