am 2e0fc8bf: am d6d70e73: Merge "Revert "Fix isSuggestionsStripVisible when keyboard hidden""

* commit '2e0fc8bf33411de82c8110878878ec1d6c392fe3':
  Revert "Fix isSuggestionsStripVisible when keyboard hidden"

1 files changed, 5 insertions, 14 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index e4594ace1..9caec5592 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2109,25 +2109,16 @@ public final class LatinIME extends InputMethodService implements KeyboardAction
     }
 
     private boolean isSuggestionsStripVisible() {
-        final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
-        if (null == mainKeyboardView || !mainKeyboardView.isShown()) {
-            return false;
-        }
-        if (mSuggestionStripView == null) {
+        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);
     }