diff options
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 3 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java | 12 | ||||
| -rw-r--r-- | native/src/correction.cpp | 4 | ||||
| -rw-r--r-- | native/src/defines.h | 1 | ||||
| -rw-r--r-- | native/src/unigram_dictionary.cpp | 2 |
5 files changed, 16 insertions, 6 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 54d842f09..df61689e1 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -225,12 +225,13 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions, keyboard.setAutomaticTemporaryUpperCase(); } else { final boolean shifted = (shiftMode == MANUAL_SHIFT); + // TODO: Remove duplicated logic in KeyboardState#setShifted // On non-distinct multi touch panel device, we should also turn off the shift locked // state when shift key is pressed to go to normal mode. // On the other hand, on distinct multi touch panel device, turning off the shift // locked state with shift key pressing is handled by onReleaseShift(). if (!hasDistinctMultitouch() && !shifted && mState.isShiftLocked()) { - keyboard.setShiftLocked(false); + setShiftLocked(false); } keyboard.setShifted(shifted); } diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java index 42f069c83..609593e44 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java @@ -166,21 +166,29 @@ public class KeyboardState { if (DEBUG_STATE) { Log.d(TAG, "setShifted: shiftMode=" + shiftModeToString(shiftMode)); } + // TODO: Remove this hack in conjunction with duplicated logic below. + boolean needsToTurnOffShiftLockedLater = false; if (shiftMode == SwitchActions.AUTOMATIC_SHIFT) { mKeyboardShiftState.setAutomaticTemporaryUpperCase(); } else { - // TODO: Duplicated logic in KeyboardSwitcher#setShifted() + // TODO: Remove duplicated logic in KeyboardSwitcher#setShifted() final boolean shifted = (shiftMode == SwitchActions.MANUAL_SHIFT); // On non-distinct multi touch panel device, we should also turn off the shift locked // state when shift key is pressed to go to normal mode. // On the other hand, on distinct multi touch panel device, turning off the shift // locked state with shift key pressing is handled by onReleaseShift(). if (!mHasDistinctMultitouch && !shifted && mKeyboardShiftState.isShiftLocked()) { - mKeyboardShiftState.setShiftLocked(false); + // Setting shift lock state should be delayed after + // mSwitchActions.setShifted(shiftMode) is called, because in that call the state + // is referenced. + needsToTurnOffShiftLockedLater = true; } mKeyboardShiftState.setShifted(shifted); } mSwitchActions.setShifted(shiftMode); + if (needsToTurnOffShiftLockedLater) { + mKeyboardShiftState.setShiftLocked(false); + } } private void setShiftLocked(boolean shiftLocked) { diff --git a/native/src/correction.cpp b/native/src/correction.cpp index 43ab3f59c..75831b69d 100644 --- a/native/src/correction.cpp +++ b/native/src/correction.cpp @@ -168,8 +168,8 @@ int Correction::getFinalFreq(const int freq, unsigned short **word, int *wordLen const int outputIndex = mTerminalOutputIndex; const int inputIndex = mTerminalInputIndex; *wordLength = outputIndex + 1; - if (mProximityInfo->sameAsTyped(mWord, outputIndex + 1) || outputIndex < MIN_SUGGEST_DEPTH) { - return -1; + if (outputIndex < MIN_SUGGEST_DEPTH) { + return NOT_A_FREQUENCY; } *word = mWord; diff --git a/native/src/defines.h b/native/src/defines.h index 48f92d86c..ce3f85acd 100644 --- a/native/src/defines.h +++ b/native/src/defines.h @@ -172,6 +172,7 @@ static void prof_out(void) { #define EQUIVALENT_CHAR_WITHOUT_DISTANCE_INFO -2 #define PROXIMITY_CHAR_WITHOUT_DISTANCE_INFO -3 #define NOT_A_INDEX -1 +#define NOT_A_FREQUENCY -1 #define KEYCODE_SPACE ' ' diff --git a/native/src/unigram_dictionary.cpp b/native/src/unigram_dictionary.cpp index 85e7e9bf2..69e3200fc 100644 --- a/native/src/unigram_dictionary.cpp +++ b/native/src/unigram_dictionary.cpp @@ -335,7 +335,7 @@ inline void UnigramDictionary::onTerminal(const int freq, int wordLength; unsigned short* wordPointer; const int finalFreq = correction->getFinalFreq(freq, &wordPointer, &wordLength); - if (finalFreq >= 0) { + if (finalFreq != NOT_A_FREQUENCY) { if (!terminalAttributes.isShortcutOnly()) { if (addToMasterQueue) { addWord(wordPointer, wordLength, finalFreq, masterQueue); |