nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Move a test (A77)"

main
Jean Chalard 2012-07-09 23:01:33 -07:00 committed by Android (Google) Code Review
parent 75e605f7ca c466cd3f99
commit fed702a0ad
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1690,10 +1690,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
SuggestedWords suggestedWords = mSuggest.getSuggestedWords(mWordComposer, SuggestedWords suggestedWords = mSuggest.getSuggestedWords(mWordComposer,
prevWord, mKeyboardSwitcher.getKeyboard().getProximityInfo(), prevWord, mKeyboardSwitcher.getKeyboard().getProximityInfo(),
mCurrentSettings.mCorrectionEnabled, !mWordComposer.isComposingWord()); mCurrentSettings.mCorrectionEnabled, !mWordComposer.isComposingWord());
suggestedWords = maybeRetrieveOlderSuggestions(typedWord, suggestedWords);
if (mWordComposer.isComposingWord()) {
suggestedWords = maybeRetrieveOlderSuggestions(typedWord, suggestedWords);
}
if (null != suggestedWords && suggestedWords.size() > 0) { if (null != suggestedWords && suggestedWords.size() > 0) {
showSuggestions(suggestedWords, typedWord); showSuggestions(suggestedWords, typedWord);
@ -1711,7 +1708,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// in most cases, suggestion count is 1 when typed word's length is 1, but we do always // in most cases, suggestion count is 1 when typed word's length is 1, but we do always
// need to clear the previous state when the user starts typing a word (i.e. typed word's // need to clear the previous state when the user starts typing a word (i.e. typed word's
// length == 1). // length == 1).
if (suggestedWords.size() > 1 || typedWord.length() == 1 if (suggestedWords.size() > 1 || typedWord.length() == 1 || !mWordComposer.isComposingWord()
|| !suggestedWords.mTypedWordValid || !suggestedWords.mTypedWordValid
|| mSuggestionsView.isShowingAddToDictionaryHint()) { || mSuggestionsView.isShowingAddToDictionaryHint()) {
return suggestedWords; return suggestedWords;