Merge "Small reorganization" (d17ff722) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -1857,6 +1857,11 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		\|\| mSuggestionsView.isShowingAddToDictionaryHint()) {
		builder.setTypedWordValid(!allowsToBeAutoCorrected).setHasMinimalSuggestion(
		autoCorrectionAvailable);
		if (Suggest.shouldBlockAutoCorrectionBySafetyNet(builder, mSuggest,
		mSettingsValues.mAutoCorrectionThreshold)) {
		builder.setShouldBlockAutoCorrectionBySafetyNet();
		}
		showSuggestions(builder.build(), typedWord);
		} else {
		SuggestedWords previousSuggestions = mSuggestionsView.getSuggestions();
		if (previousSuggestions == mSettingsValues.mSuggestPuncList) {
		@@ -1866,13 +1871,9 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
		previousSuggestions = SuggestedWords.EMPTY;
		}
		builder.addTypedWordAndPreviousSuggestions(typedWord, previousSuggestions);
		}
		if (Suggest.shouldBlockAutoCorrectionBySafetyNet(builder, mSuggest,
		mSettingsValues.mAutoCorrectionThreshold)) {
		builder.setShouldBlockAutoCorrectionBySafetyNet();
		}
		showSuggestions(builder.build(), typedWord);
		}
		}

		public void showSuggestions(final SuggestedWords suggestedWords, final CharSequence typedWord) {
		final CharSequence autoCorrection;