Reduction, step 8

Change-Id: I54334039597e235e24f169e34c1d44109180ee88
main
Jean Chalard 2012-03-09 18:36:07 +09:00
parent a333ff19ef
commit 0cf422fbb7
2 changed files with 16 additions and 16 deletions

View File

@ -2038,10 +2038,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
if (mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM) { if (mCorrectionMode == Suggest.CORRECTION_FULL_BIGRAM) {
final CharSequence prevWord = EditingUtils.getThisWord(getCurrentInputConnection(), final CharSequence prevWord = EditingUtils.getThisWord(getCurrentInputConnection(),
mSettingsValues.mWordSeparators); mSettingsValues.mWordSeparators);
if (!TextUtils.isEmpty(prevWord)) {
builder = mSuggest.getBigramPredictionWordBuilder(prevWord); builder = mSuggest.getBigramPredictionWordBuilder(prevWord);
} else { } else {
builder = null; builder = null;
} }
} else {
builder = null;
}
if (null == builder || builder.size() > 0) { if (null == builder || builder.size() > 0) {
// Explicitly supply an empty typed word (the no-second-arg version of // Explicitly supply an empty typed word (the no-second-arg version of

View File

@ -276,9 +276,6 @@ public class Suggest implements Dictionary.WordCallback {
Arrays.fill(mBigramScores, 0); Arrays.fill(mBigramScores, 0);
collectGarbage(mBigramSuggestions, PREF_MAX_BIGRAMS); 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(); CharSequence lowerPrevWord = prevWordForBigram.toString().toLowerCase();
if (mMainDict != null && mMainDict.isValidWord(lowerPrevWord)) { if (mMainDict != null && mMainDict.isValidWord(lowerPrevWord)) {
prevWordForBigram = lowerPrevWord; prevWordForBigram = lowerPrevWord;
@ -291,7 +288,6 @@ public class Suggest implements Dictionary.WordCallback {
for (int i = 0; i < insertCount; ++i) { for (int i = 0; i < insertCount; ++i) {
addBigramToSuggestions(mBigramSuggestions.get(i)); addBigramToSuggestions(mBigramSuggestions.get(i));
} }
}
StringUtils.removeDupes(mSuggestions); StringUtils.removeDupes(mSuggestions);