commit 2e0fc8bf33411de82c8110878878ec1d6c392fe3
author Ken Wakasa <kwakasa@google.com> Tue May 14 04:47:37 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 14 04:47:37 2013 -0700
tree e232fd775fa5ae6a3fa90c7a9db86359e9c00f55
parent 3fff5179d5020123c5bae7a1c83591afd45ace58
parent d6d70e7325d9667e2780a150015802af232e997d

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

* commit 'd6d70e7325d9667e2780a150015802af232e997d':
  Revert "Fix isSuggestionsStripVisible when keyboard hidden"

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 e4594ac..9caec55 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2109,25 +2109,16 @@
     }
 
     private boolean isSuggestionsStripVisible() {
-        final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
-        if (null == mainKeyboardView || !mainKeyboardView.isShown()) {
+        if (mSuggestionStripView == null)
             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);
     }