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

Reduction, step 8

Browse source 
Change-Id: I54334039597e235e24f169e34c1d44109180ee88
This commit is contained in:
Jean Chalard 2012-03-09 18:36:07 +09:00
parent a333ff19ef
commit 0cf422fbb7
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -2038,7 +2038,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
if (mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM) {
final CharSequence prevWord = EditingUtils.getThisWord(getCurrentInputConnection(),
mSettingsValues.mWordSeparators);
builder = mSuggest.getBigramPredictionWordBuilder(prevWord);
if (!TextUtils.isEmpty(prevWord)) {
builder = mSuggest.getBigramPredictionWordBuilder(prevWord);
} else {
builder = null;
}
} else {
builder = null;
}

26
java/src/com/android/inputmethod/latin/Suggest.java
View file

@ -276,21 +276,17 @@ public class Suggest implements Dictionary.WordCallback {
Arrays.fill(mBigramScores, 0);
collectGarbage(mBigramSuggestions, PREF_MAX_BIGRAMS);
// Note that if prevWordForBigram is empty, we'll always return the same empty
// SuggestedWords.Builder
if (!TextUtils.isEmpty(prevWordForBigram)) {
CharSequence lowerPrevWord = prevWordForBigram.toString().toLowerCase();
if (mMainDict != null && mMainDict.isValidWord(lowerPrevWord)) {
prevWordForBigram = lowerPrevWord;
}
for (final Dictionary dictionary : mBigramDictionaries.values()) {
dictionary.getBigrams(sEmptyWordComposer, prevWordForBigram, this);
}
// Nothing entered: return all bigrams for the previous word
int insertCount = Math.min(mBigramSuggestions.size(), mPrefMaxSuggestions);
for (int i = 0; i < insertCount; ++i) {
addBigramToSuggestions(mBigramSuggestions.get(i));
}
CharSequence lowerPrevWord = prevWordForBigram.toString().toLowerCase();
if (mMainDict != null && mMainDict.isValidWord(lowerPrevWord)) {
prevWordForBigram = lowerPrevWord;
}
for (final Dictionary dictionary : mBigramDictionaries.values()) {
dictionary.getBigrams(sEmptyWordComposer, prevWordForBigram, this);
}
// Nothing entered: return all bigrams for the previous word
int insertCount = Math.min(mBigramSuggestions.size(), mPrefMaxSuggestions);
for (int i = 0; i < insertCount; ++i) {
addBigramToSuggestions(mBigramSuggestions.get(i));
}
StringUtils.removeDupes(mSuggestions);