From 2c5cf744e554cbe0872f1b3e18cbd1383b0189f9 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Wed, 11 Jul 2012 18:49:44 +0900 Subject: Increase encapsulation (A118) showSuggestions is only ever called by updateSuggestionsOrPredictions. It only feels natural that, when called with a 0-sized or null suggestion list, it clears the suggestions. Change-Id: I5b52bc9151afca1bb6c6f0a7f81e3255add92177 --- java/src/com/android/inputmethod/latin/LatinIME.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'java/src') diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 3014e7f2b..f27d32150 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1668,6 +1668,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen } } + // TODO: rename this method to updateSuggestionStrip or simply updateSuggestions private void updateSuggestionsOrPredictions() { mHandler.cancelUpdateSuggestionStrip(); @@ -1699,11 +1700,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen mCurrentSettings.mCorrectionEnabled); suggestedWords = maybeRetrieveOlderSuggestions(typedWord, suggestedWords); - if (null != suggestedWords && suggestedWords.size() > 0) { - showSuggestions(suggestedWords, typedWord); - } else { - clearSuggestions(); - } + showSuggestions(suggestedWords, typedWord); } private SuggestedWords maybeRetrieveOlderSuggestions(final CharSequence typedWord, @@ -1738,7 +1735,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen private void showSuggestions(final SuggestedWords suggestedWords, final CharSequence typedWord) { - // This method is only ever called by updateSuggestions or updateBigramPredictions. + if (null == suggestedWords || suggestedWords.size() <= 0) { + clearSuggestions(); + return; + } final CharSequence autoCorrection; if (suggestedWords.size() > 0) { if (suggestedWords.mWillAutoCorrect) { -- cgit v1.2.3-83-g751a