diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-01-19 02:15:29 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-01-19 02:15:29 -0800 |
| commit | 6d6c96013606d563339b28e617435c61bfca0e0d (patch) | |
| tree | a97da1eef42b3cadf9bb2b84c53515cb3faf9380 /tests/src | |
| parent | 33b1944f921714456ad2a24acbba60266e72e601 (diff) | |
| parent | 0ef9bfe5932cb1b099809b4622bf45427f0430dd (diff) | |
| download | latinime-6d6c96013606d563339b28e617435c61bfca0e0d.tar.gz latinime-6d6c96013606d563339b28e617435c61bfca0e0d.tar.xz latinime-6d6c96013606d563339b28e617435c61bfca0e0d.zip | |
am 0ef9bfe5: Merge "Fix KeyboardState switching back from alphabet-chording input correctly"
* commit '0ef9bfe5932cb1b099809b4622bf45427f0430dd':
Fix KeyboardState switching back from alphabet-chording input correctly
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java index 7ca65cd69..729120bba 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java @@ -109,16 +109,15 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { // Release shift key, switch back to symbols shifted state. releaseKey(CODE_SHIFT, SYMBOLS_SHIFTED); - // TODO: This test fails due to bug. -// // Press "ABC" key and hold, enter into choring alphabet state. -// pressKey(CODE_SYMBOL, ALPHABET_UNSHIFTED); -// -// // Press/release letter keys. -// chordingPressAndReleaseKey('a', ALPHABET_UNSHIFTED, ALPHABET_UNSHIFTED); -// chordingPressAndReleaseKey('b', ALPHABET_UNSHIFTED, ALPHABET_UNSHIFTED); -// -// // Release "ABC" key, switch back to symbols. -// releaseKey(CODE_SYMBOL, SYMBOLS_SHIFTED); + // Press "ABC" key and hold, enter into choring alphabet state. + pressKey(CODE_SYMBOL, ALPHABET_UNSHIFTED); + + // Press/release letter keys. + chordingPressAndReleaseKey('a', ALPHABET_UNSHIFTED, ALPHABET_UNSHIFTED); + chordingPressAndReleaseKey('b', ALPHABET_UNSHIFTED, ALPHABET_UNSHIFTED); + + // Release "ABC" key, switch back to symbols. + releaseKey(CODE_SYMBOL, SYMBOLS_SHIFTED); } // Chording shift key in automatic upper case. |