Merge "Refactoring (A11)"

main
Jean Chalard 2012-06-26 01:52:18 -07:00 committed by Android (Google) Code Review
commit 1822388727
1 changed files with 9 additions and 5 deletions

View File

@ -239,16 +239,20 @@ public class Suggest implements Dictionary.WordCallback {
if (wordComposer.size() <= 1 && isCorrectionEnabled) { if (wordComposer.size() <= 1 && isCorrectionEnabled) {
// At first character typed, search only the bigrams // At first character typed, search only the bigrams
if (!TextUtils.isEmpty(prevWordForBigram)) { if (!TextUtils.isEmpty(prevWordForBigram)) {
final CharSequence lowerPrevWord;
if (StringUtils.hasUpperCase(prevWordForBigram)) { if (StringUtils.hasUpperCase(prevWordForBigram)) {
// TODO: Must pay attention to locale when changing case. // TODO: Must pay attention to locale when changing case.
final CharSequence lowerPrevWord = prevWordForBigram.toString().toLowerCase(); lowerPrevWord = prevWordForBigram.toString().toLowerCase();
for (final Dictionary dictionary : mBigramDictionaries.values()) { } else {
lowerPrevWord = null;
}
for (final String key : mBigramDictionaries.keySet()) {
final Dictionary dictionary = mBigramDictionaries.get(key);
dictionary.getBigrams(wordComposer, prevWordForBigram, this);
if (null != lowerPrevWord) {
dictionary.getBigrams(wordComposer, lowerPrevWord, this); dictionary.getBigrams(wordComposer, lowerPrevWord, this);
} }
} }
for (final Dictionary dictionary : mBigramDictionaries.values()) {
dictionary.getBigrams(wordComposer, prevWordForBigram, this);
}
} }
} else if (wordComposer.size() > 1) { } else if (wordComposer.size() > 1) {
final WordComposer wordComposerForLookup; final WordComposer wordComposerForLookup;