am dccad3ef: am cb0d1c4c: Fix isSuggestionsStripVisible when keyboard hidden

* commit 'dccad3efa4af41282857df5140e8ca6dc9ad99be':
  Fix isSuggestionsStripVisible when keyboard hidden

1 files changed, 14 insertions, 5 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index fdd470cf1..5dd42bf02 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2102,16 +2102,25 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
     }
 
     private boolean isSuggestionsStripVisible() {
-        if (mSuggestionStripView == null)
+        final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
+        if (null == mainKeyboardView || !mainKeyboardView.isShown()) {
+            return false;
+        }
+        if (mSuggestionStripView == null) {
             return false;
-        if (mSuggestionStripView.isShowingAddToDictionaryHint())
+        }
+        if (mSuggestionStripView.isShowingAddToDictionaryHint()) {
             return true;
-        if (null == mSettings.getCurrent())
+        }
+        if (null == mSettings.getCurrent()) {
             return false;
-        if (!mSettings.getCurrent().isSuggestionStripVisibleInOrientation(mDisplayOrientation))
+        }
+        if (!mSettings.getCurrent().isSuggestionStripVisibleInOrientation(mDisplayOrientation)) {
             return false;
-        if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn())
+        }
+        if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) {
             return true;
+        }
         return mSettings.getCurrent().isSuggestionsRequested(mDisplayOrientation);
     }