commit 2c5cf744e554cbe0872f1b3e18cbd1383b0189f9
author Jean Chalard <jchalard@google.com> Wed Jul 11 18:49:44 2012 +0900
committer Jean Chalard <jchalard@google.com> Thu Jul 12 15:58:16 2012 +0900
tree 6421527cd4f45281a29e47b4ca99c3203a66f2c3
parent 1343d27de30c4010c54576d6c8bbb052c7630cbe

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

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 3014e7f..f27d321 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1668,6 +1668,7 @@
         }
     }
 
+    // TODO: rename this method to updateSuggestionStrip or simply updateSuggestions
     private void updateSuggestionsOrPredictions() {
         mHandler.cancelUpdateSuggestionStrip();
 
@@ -1699,11 +1700,7 @@
                 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 @@
 
     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) {