diff options
| author |   Jean Chalard <jchalard@google.com> | 2013-12-13 08:34:09 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-12-13 08:34:09 -0800 |
| commit | c6137f176563c5e2f6518f6354576a96357f4d85 (patch) | |
| tree | a5bf0baf55c01f209b94d6d03f01c54d55a2601b /java/src | |
| parent | a8b3fa937fba02c1e98fd545a632c68fe29374f1 (diff) | |
| parent | f3d281b775532a8d0dd05ba708a9b962182fbd1c (diff) | |
| download | latinime-c6137f176563c5e2f6518f6354576a96357f4d85.tar.gz latinime-c6137f176563c5e2f6518f6354576a96357f4d85.tar.xz latinime-c6137f176563c5e2f6518f6354576a96357f4d85.zip | |
am f3d281b7: Merge "Fix a bug where recapitalize prevents going to more syms"
* commit 'f3d281b775532a8d0dd05ba708a9b962182fbd1c':
Fix a bug where recapitalize prevents going to more syms
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java index dd98c1703..0c80ce206 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java @@ -304,6 +304,7 @@ public final class KeyboardState { mSwitchActions.setSymbolsKeyboard(); mIsAlphabetMode = false; mIsSymbolShifted = false; + mRecapitalizeMode = RecapitalizeStatus.NOT_A_RECAPITALIZE_MODE; // Reset alphabet shift state. mAlphabetShiftState.setShiftLocked(false); mSwitchState = SWITCH_STATE_SYMBOL_BEGIN; @@ -316,6 +317,7 @@ public final class KeyboardState { mSwitchActions.setSymbolsShiftedKeyboard(); mIsAlphabetMode = false; mIsSymbolShifted = true; + mRecapitalizeMode = RecapitalizeStatus.NOT_A_RECAPITALIZE_MODE; // Reset alphabet shift state. mAlphabetShiftState.setShiftLocked(false); mSwitchState = SWITCH_STATE_SYMBOL_BEGIN; @@ -327,6 +329,7 @@ public final class KeyboardState { } mIsAlphabetMode = false; mIsEmojiMode = true; + mRecapitalizeMode = RecapitalizeStatus.NOT_A_RECAPITALIZE_MODE; // Remember caps lock mode and reset alphabet shift state. mPrevMainKeyboardWasShiftLocked = mAlphabetShiftState.isShiftLocked(); mAlphabetShiftState.setShiftLocked(false); |