commit c9398a3b399e46aa4fb4de18c4c3d41ffd96e1fa
author Tadashi G. Takaoka <takaoka@google.com> Tue May 14 06:53:15 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 14 06:53:15 2013 +0000
tree 175625ff4d0b95fd281867b701766e4212ec7f6b
parent cb0d1c4c584f3f47da3f630441b7de1e741584e0
parent 979fb7415bdd185bb941d67d9d0f53f016a419a9

Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan"

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