Merge "[IL106] Inline a now useless method." (0c186c31) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+0 −12

Original line number	Diff line number	Diff line
		@@ -1519,18 +1519,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		}
		}

		public void unsetIsAutoCorrectionIndicatorOnAndCallShowSuggestionStrip(
		final SuggestedWords suggestedWords) {
		// Note that it's very important here that suggestedWords.mWillAutoCorrect is false.
		// We never want to auto-correct on a resumed suggestion. Please refer to the three places
		// above in restartSuggestionsOnWordTouchedByCursor() where suggestedWords is affected.
		// We also need to unset mIsAutoCorrectionIndicatorOn to avoid showSuggestionStrip touching
		// the text to adapt it.
		// TODO: remove mIsAutoCorrectionIndicatorOn (see comment on definition)
		mInputLogic.mIsAutoCorrectionIndicatorOn = false;
		mHandler.showSuggestionStrip(suggestedWords);
		}

		// TODO: Make this private
		// Outside LatinIME, only used by the {@link InputTestsBase} test suite.
		@UsedForTesting

+4 −3

Original line number	Diff line number	Diff line
		@@ -1217,8 +1217,8 @@ public final class InputLogic {
		// Since there is only one word, willAutoCorrect is false.
		suggestedWords = suggestedWordsIncludingTypedWord;
		}
		mLatinIME.unsetIsAutoCorrectionIndicatorOnAndCallShowSuggestionStrip(
		suggestedWords);
		mIsAutoCorrectionIndicatorOn = false;
		mLatinIME.mHandler.showSuggestionStrip(suggestedWords);
		}});
		} else {
		// We found suggestion spans in the word. We'll create the SuggestedWords out of
		@@ -1227,7 +1227,8 @@ public final class InputLogic {
		true /* typedWordValid /, false / willAutoCorrect */,
		false /* isPunctuationSuggestions /, false / isObsoleteSuggestions */,
		false /* isPrediction */, SuggestedWords.NOT_A_SEQUENCE_NUMBER);
		mLatinIME.unsetIsAutoCorrectionIndicatorOnAndCallShowSuggestionStrip(suggestedWords);
		mIsAutoCorrectionIndicatorOn = false;
		mLatinIME.mHandler.showSuggestionStrip(suggestedWords);
		}
		}