am bd3b20ce: Merge "Always update voice key visibility"

* commit 'bd3b20ce733e19ac6a97a7f6934fc2ba0d183890':
  Always update voice key visibility

1 files changed, 3 insertions, 2 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 0dccba09c..51dd4463e 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -747,6 +747,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         }
         Log.i(TAG, "Starting input. Cursor position = "
                 + editorInfo.initialSelStart + "," + editorInfo.initialSelEnd);
+        // TODO: Consolidate these checks with {@link InputAttributes}.
         if (InputAttributes.inPrivateImeOptions(null, NO_MICROPHONE_COMPAT, editorInfo)) {
             Log.w(TAG, "Deprecated private IME option specified: " + editorInfo.privateImeOptions);
             Log.w(TAG, "Use " + getPackageName() + "." + NO_MICROPHONE + " instead");
@@ -1352,11 +1353,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
         if (!onEvaluateInputViewShown()) {
             return;
         }
+
+        mSuggestionStripView.updateVisibility(isSuggestionStripVisible, isFullscreenMode());
         if (!isSuggestionStripVisible) {
-            mSuggestionStripView.setVisibility(isFullscreenMode() ? View.GONE : View.INVISIBLE);
             return;
         }
-        mSuggestionStripView.setVisibility(View.VISIBLE);
 
         final SettingsValues currentSettings = mSettings.getCurrent();
         final boolean showSuggestions;