Merge "Remove useless tests (B5)"

This commit is contained in:
Jean Chalard 2012-03-08 22:22:56 -08:00 committed by Android (Google) Code Review
commit de19ab878d

View file

@ -277,11 +277,9 @@ public class Suggest implements Dictionary.WordCallback {
final String consideredWord = mTrailingSingleQuotesCount > 0
? typedWord.substring(0, typedWord.length() - mTrailingSingleQuotesCount)
: typedWord;
if (typedWord != null) {
// Treating USER_TYPED as UNIGRAM suggestion for logging now.
LatinImeLogger.onAddSuggestedWord(typedWord, Suggest.DIC_USER_TYPED,
Dictionary.UNIGRAM);
}
// Treating USER_TYPED as UNIGRAM suggestion for logging now.
LatinImeLogger.onAddSuggestedWord(typedWord, Suggest.DIC_USER_TYPED,
Dictionary.UNIGRAM);
mConsideredWord = consideredWord;
if (wordComposer.size() <= 1 && (correctionMode == CORRECTION_FULL_BIGRAM)) {
@ -340,8 +338,7 @@ public class Suggest implements Dictionary.WordCallback {
}
}
}
final String consideredWordString =
consideredWord == null ? null : consideredWord.toString();
final String consideredWordString = consideredWord.toString();
CharSequence whitelistedWord = capitalizeWord(mIsAllUpperCase, mIsFirstCharCapitalized,
mWhiteListDictionary.getWhitelistedWord(consideredWordString));
@ -369,9 +366,7 @@ public class Suggest implements Dictionary.WordCallback {
}
}
if (typedWord != null) {
mSuggestions.add(0, typedWord.toString());
}
mSuggestions.add(0, typedWord.toString());
StringUtils.removeDupes(mSuggestions);
if (DBG) {