Merge "[IL112] Cleanup" (c92dabb2) · Commits · e / os / android_packages_inputmethods_LatinIME

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

+1 −6

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

	mHandler.cancelUpdateSuggestionStrip();		mHandler.cancelUpdateSuggestionStrip();
	mHandler.cancelDoubleSpacePeriodTimer();		mHandler.cancelDoubleSpacePeriodTimer();
	@@ -1509,15 +1509,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
	mSuggestionStripView.showAddToDictionaryHint(word);		mSuggestionStripView.showAddToDictionaryHint(word);
	}		}

	// TODO[IL]: Define a clean interface for this
	// This will show either an empty suggestion strip (if prediction is enabled) or		// This will show either an empty suggestion strip (if prediction is enabled) or
	// punctuation suggestions (if it's disabled).		// punctuation suggestions (if it's disabled).
	@Override		@Override
	public void setNeutralSuggestionStrip() {		public void setNeutralSuggestionStrip() {
	setNeutralSuggestionStripInternal();
	}

	private void setNeutralSuggestionStripInternal() {
	final SettingsValues currentSettings = mSettings.getCurrent();		final SettingsValues currentSettings = mSettings.getCurrent();
	final SuggestedWords neutralSuggestions = currentSettings.mBigramPredictionEnabled		final SuggestedWords neutralSuggestions = currentSettings.mBigramPredictionEnabled
	? SuggestedWords.EMPTY : currentSettings.mSpacingAndPunctuations.mSuggestPuncList;		? SuggestedWords.EMPTY : currentSettings.mSpacingAndPunctuations.mSuggestPuncList;