Merge "[IL95] Inline a method that's always called in sequence"

1 files changed, 7 insertions, 8 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index efc14fc86..7defa4529 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1010,8 +1010,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
                 false /* isObsoleteSuggestions */,
                 false /* isPrediction */);
         // When in fullscreen mode, show completions generated by the application
-        setSuggestedWords(suggestedWords);
-        setSuggestionStripShown(true);
+        setSuggestedWords(suggestedWords, true /* shouldShow */);
         if (ProductionFlag.USES_DEVELOPMENT_ONLY_DIAGNOSTICS) {
             ResearchLogger.latinIME_onDisplayCompletions(applicationSpecifiedCompletions);
         }
@@ -1329,7 +1328,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     }
 
     // TODO[IL]: Define a clear interface for this
-    public void setSuggestedWords(final SuggestedWords words) {
+    public void setSuggestedWords(final SuggestedWords words, final boolean shouldShow) {
         if (mSuggestionStripView != null) {
             mSuggestionStripView.setSuggestions(words);
             mKeyboardSwitcher.onAutoCorrectionStateChanged(words.mWillAutoCorrect);
@@ -1348,6 +1347,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             // the practice.
             mInputLogic.mConnection.setComposingText(textWithUnderline, 1);
         }
+        setSuggestionStripShown(shouldShow);
     }
 
     // TODO[IL]: Move this out of LatinIME.
@@ -1436,8 +1436,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         if (SuggestedWords.EMPTY != suggestedWords) {
             mInputLogic.mWordComposer.setAutoCorrection(autoCorrection);
         }
-        setSuggestedWords(suggestedWords);
-        setSuggestionStripShown(isSuggestionsStripVisible());
+        setSuggestedWords(suggestedWords, isSuggestionsStripVisible());
         // Cache the auto-correction in accessibility code so we can speak it if the user
         // touches a key that will insert it.
         AccessibilityUtils.getInstance().setAutoCorrection(suggestedWords, typedWord);
@@ -1550,11 +1549,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
     public void setNeutralSuggestionStrip() {
         final SettingsValues currentSettings = mSettings.getCurrent();
         if (currentSettings.mBigramPredictionEnabled) {
-            setSuggestedWords(SuggestedWords.EMPTY);
+            setSuggestedWords(SuggestedWords.EMPTY, isSuggestionsStripVisible());
         } else {
-            setSuggestedWords(currentSettings.mSpacingAndPunctuations.mSuggestPuncList);
+            setSuggestedWords(currentSettings.mSpacingAndPunctuations.mSuggestPuncList,
+                    isSuggestionsStripVisible());
         }
-        setSuggestionStripShown(isSuggestionsStripVisible());
     }
 
     public void unsetIsAutoCorrectionIndicatorOnAndCallShowSuggestionStrip(