am ca1c1ddd: Merge "[IL94] Remove a function and some reordering"

* commit 'ca1c1ddd4ecdca1a863dbf8274dca2fc3e91a8ac':
  [IL94] Remove a function and some reordering
main
Jean Chalard 2014-01-27 19:48:05 -08:00 committed by Android Git Automerger
commit 4b5e56d648
1 changed files with 2 additions and 5 deletions

View File

@ -1330,15 +1330,12 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
// TODO[IL]: Define a clear interface for this
public void setSuggestedWords(final SuggestedWords words) {
mInputLogic.mSuggestedWords = words;
if (mSuggestionStripView != null) {
mSuggestionStripView.setSuggestions(words);
mKeyboardSwitcher.onAutoCorrectionStateChanged(words.mWillAutoCorrect);
}
setAutoCorrectionIndicator(words.mWillAutoCorrect);
}
private void setAutoCorrectionIndicator(final boolean newAutoCorrectionIndicator) {
mInputLogic.mSuggestedWords = words;
final boolean newAutoCorrectionIndicator = words.mWillAutoCorrect;
// Put a blue underline to a word in TextView which will be auto-corrected.
if (mInputLogic.mIsAutoCorrectionIndicatorOn != newAutoCorrectionIndicator
&& mInputLogic.mWordComposer.isComposingWord()) {