Merge "[IL84] Remove a useless call and rename a method" (264f4e38) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -789,7 +789,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		if (mSuggestionStripView != null) {
		// This will set the punctuation suggestions if next word suggestion is off;
		// otherwise it will clear the suggestion strip.
		setPunctuationSuggestions();
		setNeutralSuggestionStrip();
		}

		// Sometimes, while rotating, for some reason the framework tells the app we are not
		@@ -1561,11 +1561,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
		}

		// TODO[IL]: Define a clean interface for this
		public void setPunctuationSuggestions() {
		// This will show either an empty suggestion strip (if prediction is enabled) or
		// punctuation suggestions (if it's disabled).
		public void setNeutralSuggestionStrip() {
		final SettingsValues currentSettings = mSettings.getCurrent();
		if (currentSettings.mBigramPredictionEnabled) {
		setSuggestedWords(SuggestedWords.EMPTY);
		setAutoCorrectionIndicator(false);
		} else {
		setSuggestedWords(currentSettings.mSpacingAndPunctuations.mSuggestPuncList);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -722,7 +722,7 @@ public final class InputLogic {

		// Set punctuation right away. onUpdateSelection will fire but tests whether it is
		// already displayed or not, so it's okay.
		mLatinIME.setPunctuationSuggestions();
		mLatinIME.setNeutralSuggestionStrip();
		}

		keyboardSwitcher.updateShiftState();
		@@ -1075,7 +1075,7 @@ public final class InputLogic {
		}

		if (!mWordComposer.isComposingWord() && !settingsValues.mBigramPredictionEnabled) {
		mLatinIME.setPunctuationSuggestions();
		mLatinIME.setNeutralSuggestionStrip();
		return;
		}