diff options
| -rw-r--r-- | dictionaries/de_wordlist.xml.gz | bin | 1264849 -> 1307453 bytes | |||
| -rw-r--r-- | dictionaries/en_gb_wordlist.xml.gz | bin | 873666 -> 874043 bytes | |||
| -rw-r--r-- | dictionaries/en_wordlist.xml.gz | bin | 916081 -> 916419 bytes | |||
| -rw-r--r-- | dictionaries/fr_wordlist.xml.gz | bin | 1118441 -> 1120276 bytes | |||
| -rw-r--r-- | dictionaries/ru_wordlist.xml.gz | bin | 1367381 -> 13441962 bytes | |||
| -rw-r--r-- | java/res/raw/main_de.dict | bin | 1605732 -> 1605718 bytes | |||
| -rw-r--r-- | java/res/raw/main_en.dict | bin | 1069783 -> 1069793 bytes | |||
| -rw-r--r-- | java/res/raw/main_es.dict | bin | 1138855 -> 1138874 bytes | |||
| -rw-r--r-- | java/res/raw/main_fr.dict | bin | 1329511 -> 1329601 bytes | |||
| -rw-r--r-- | java/res/raw/main_it.dict | bin | 1143310 -> 1143329 bytes | |||
| -rw-r--r-- | java/res/raw/main_pt_br.dict | bin | 1091965 -> 1091987 bytes | |||
| -rw-r--r-- | java/res/raw/main_ru.dict | bin | 2240073 -> 2239641 bytes | |||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java | 5 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java | 26 |
14 files changed, 26 insertions, 5 deletions
diff --git a/dictionaries/de_wordlist.xml.gz b/dictionaries/de_wordlist.xml.gz Binary files differindex a4267b35a..f193ed2f5 100644 --- a/dictionaries/de_wordlist.xml.gz +++ b/dictionaries/de_wordlist.xml.gz diff --git a/dictionaries/en_gb_wordlist.xml.gz b/dictionaries/en_gb_wordlist.xml.gz Binary files differindex 274424cf2..f955186f6 100644 --- a/dictionaries/en_gb_wordlist.xml.gz +++ b/dictionaries/en_gb_wordlist.xml.gz diff --git a/dictionaries/en_wordlist.xml.gz b/dictionaries/en_wordlist.xml.gz Binary files differindex 6e57f4212..d5c5b8a27 100644 --- a/dictionaries/en_wordlist.xml.gz +++ b/dictionaries/en_wordlist.xml.gz diff --git a/dictionaries/fr_wordlist.xml.gz b/dictionaries/fr_wordlist.xml.gz Binary files differindex 3134a040a..5f8a5eb7d 100644 --- a/dictionaries/fr_wordlist.xml.gz +++ b/dictionaries/fr_wordlist.xml.gz diff --git a/dictionaries/ru_wordlist.xml.gz b/dictionaries/ru_wordlist.xml.gz Binary files differindex 877f0608e..020fe684d 100644 --- a/dictionaries/ru_wordlist.xml.gz +++ b/dictionaries/ru_wordlist.xml.gz diff --git a/java/res/raw/main_de.dict b/java/res/raw/main_de.dict Binary files differindex 6122cd3f0..59df8b829 100644 --- a/java/res/raw/main_de.dict +++ b/java/res/raw/main_de.dict diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict Binary files differindex de1170afd..85ee809de 100644 --- a/java/res/raw/main_en.dict +++ b/java/res/raw/main_en.dict diff --git a/java/res/raw/main_es.dict b/java/res/raw/main_es.dict Binary files differindex 7a4daf1f2..cb17926e0 100644 --- a/java/res/raw/main_es.dict +++ b/java/res/raw/main_es.dict diff --git a/java/res/raw/main_fr.dict b/java/res/raw/main_fr.dict Binary files differindex c607d0e36..53fd8d139 100644 --- a/java/res/raw/main_fr.dict +++ b/java/res/raw/main_fr.dict diff --git a/java/res/raw/main_it.dict b/java/res/raw/main_it.dict Binary files differindex b93a55c93..59b78d643 100644 --- a/java/res/raw/main_it.dict +++ b/java/res/raw/main_it.dict diff --git a/java/res/raw/main_pt_br.dict b/java/res/raw/main_pt_br.dict Binary files differindex 66ac3f953..2a8af6f6e 100644 --- a/java/res/raw/main_pt_br.dict +++ b/java/res/raw/main_pt_br.dict diff --git a/java/res/raw/main_ru.dict b/java/res/raw/main_ru.dict Binary files differindex 050b0b8c4..1cddb05ab 100644 --- a/java/res/raw/main_ru.dict +++ b/java/res/raw/main_ru.dict diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java index 5e111fb9a..631e647e8 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java @@ -487,6 +487,11 @@ public final class KeyboardState { // After chording input while normal state. setShifted(UNSHIFT); } + // After chording input, automatic shift state may have been changed depending on + // what characters were input. + mShiftKeyState.onRelease(); + mSwitchActions.requestUpdatingShiftState(); + return; } else if (mAlphabetShiftState.isShiftLockShifted() && withSliding) { // In shift locked state, shift has been pressed and slid out to other key. setShiftLocked(true); diff --git a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java index f5ad7239e..053bcb53a 100644 --- a/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java +++ b/tests/src/com/android/inputmethod/keyboard/internal/KeyboardStateMultiTouchTests.java @@ -50,7 +50,7 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { pressKey(CODE_SYMBOL, SYMBOLS_UNSHIFTED); // Press/release symbol letter key. chordingPressAndReleaseKey('1', SYMBOLS_UNSHIFTED, SYMBOLS_UNSHIFTED); - // Release "123?" key, switch back to alphabet shift unshifted. + // Release "123?" key, switch back to alphabet unshifted. releaseKey(CODE_SYMBOL, ALPHABET_UNSHIFTED); } @@ -330,7 +330,7 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { releaseKey('X', ALPHABET_MANUAL_SHIFTED); // Release 'Z' key releaseKey('Z', ALPHABET_MANUAL_SHIFTED); - // Release shift key. + // Release shift key, switch back to alphabet shifted. releaseKey(CODE_SHIFT, ALPHABET_MANUAL_SHIFTED); } @@ -351,8 +351,24 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { releaseKey('X', ALPHABET_MANUAL_SHIFTED); // Release 'Z' key releaseKey('Z', ALPHABET_MANUAL_SHIFTED); - // Release shift key. + // Release shift key, updated to alphabet unshifted. releaseKey(CODE_SHIFT, ALPHABET_UNSHIFTED); + + // Update shift state with auto caps enabled. + pressAndReleaseKey(CODE_AUTO_CAPS_TRIGGER, ALPHABET_UNSHIFTED, ALPHABET_AUTOMATIC_SHIFTED); + + // Press shift key and hold, switch to alphabet shifted. + pressKey(CODE_SHIFT, ALPHABET_MANUAL_SHIFTED); + // Press 'X' key and hold + chordingPressKey('X', ALPHABET_MANUAL_SHIFTED); + // Release 'X' key + releaseKey('X', ALPHABET_MANUAL_SHIFTED); + // Press key and hold, stays in alphabet shifted. + chordingPressKey(CODE_AUTO_CAPS_TRIGGER, ALPHABET_MANUAL_SHIFTED); + // Release 'Z' key + releaseKey(CODE_AUTO_CAPS_TRIGGER, ALPHABET_MANUAL_SHIFTED); + // Release shift key, updated to alphabet automatic shifted. + releaseKey(CODE_SHIFT, ALPHABET_AUTOMATIC_SHIFTED); } // Multi touch shift chording input in capitalize character mode. @@ -372,8 +388,8 @@ public class KeyboardStateMultiTouchTests extends KeyboardStateTestsBase { releaseKey('X', ALPHABET_MANUAL_SHIFTED); // Release 'Z' key releaseKey('Z', ALPHABET_MANUAL_SHIFTED); - // Release shift key. - releaseKey(CODE_SHIFT, ALPHABET_UNSHIFTED); + // Release shift key, updated to alphabet automatic shifted. + releaseKey(CODE_SHIFT, ALPHABET_AUTOMATIC_SHIFTED); } public void testLongPressShiftAndChording() { |