From 5bc2b61274d20adf4e1b0d5728fef43c6cd51429 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 2 Mar 2012 19:59:55 +0900 Subject: [PATCH] Move a method up a level Change-Id: I6b9a697480127e4745698ab19f8a360b86ff39ca --- java/src/com/android/inputmethod/latin/LatinIME.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index a68e20a5a..2217dd2b3 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -979,7 +979,9 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar .setTypedWordValid(false) .setHasMinimalSuggestion(false); // When in fullscreen mode, show completions generated by the application - setSuggestions(builder.build()); + final SuggestedWords words = builder.build(); + setSuggestions(words); + setAutoCorrectionIndicator(words); // TODO: is this the right thing to do? What should we auto-correct to in // this case? This says to keep whatever the user typed. mWordComposer.setAutoCorrection(mWordComposer.getTypedWord()); @@ -1713,6 +1715,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar public void clearSuggestions() { setSuggestions(SuggestedWords.EMPTY); + setAutoCorrectionIndicator(SuggestedWords.EMPTY); } public void setSuggestions(final SuggestedWords words) { @@ -1721,7 +1724,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar mKeyboardSwitcher.onAutoCorrectionStateChanged( words.hasWordAboveAutoCorrectionScoreThreshold()); } - setAutoCorrectionIndicator(words); } private void setAutoCorrectionIndicator(final SuggestedWords words) { @@ -1851,6 +1853,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar } mWordComposer.setAutoCorrection(autoCorrection); setSuggestions(suggestedWords); + setAutoCorrectionIndicator(suggestedWords); setSuggestionStripShown(isSuggestionsStripVisible()); } @@ -2024,6 +2027,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar public void setPunctuationSuggestions() { setSuggestions(mSettingsValues.mSuggestPuncList); + setAutoCorrectionIndicator(mSettingsValues.mSuggestPuncList); setSuggestionStripShown(isSuggestionsStripVisible()); }