Merge "Refactoring (A11)" (18223887) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/Suggest.java

+9 −5

Original line number	Diff line number	Diff line
		@@ -239,15 +239,19 @@ public class Suggest implements Dictionary.WordCallback {
		if (wordComposer.size() <= 1 && isCorrectionEnabled) {
		// At first character typed, search only the bigrams
		if (!TextUtils.isEmpty(prevWordForBigram)) {
		final CharSequence lowerPrevWord;
		if (StringUtils.hasUpperCase(prevWordForBigram)) {
		// TODO: Must pay attention to locale when changing case.
		final CharSequence lowerPrevWord = prevWordForBigram.toString().toLowerCase();
		for (final Dictionary dictionary : mBigramDictionaries.values()) {
		dictionary.getBigrams(wordComposer, lowerPrevWord, this);
		}
		lowerPrevWord = prevWordForBigram.toString().toLowerCase();
		} else {
		lowerPrevWord = null;
		}
		for (final Dictionary dictionary : mBigramDictionaries.values()) {
		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);
		}
		}
		}
		} else if (wordComposer.size() > 1) {