aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2013-05-14 15:05:40 +0900
committerJean Chalard <jchalard@google.com>2013-05-14 15:19:19 +0900
commitcb0d1c4c584f3f47da3f630441b7de1e741584e0 (patch)
treec4cb1337c5e253d7bc7b38c5a81ee7310938838f /java/src
parente69066d11bde67d2370ed267d89ff8b421482cce (diff)
downloadlatinime-cb0d1c4c584f3f47da3f630441b7de1e741584e0.tar.gz
latinime-cb0d1c4c584f3f47da3f630441b7de1e741584e0.tar.xz
latinime-cb0d1c4c584f3f47da3f630441b7de1e741584e0.zip
Fix isSuggestionsStripVisible when keyboard hidden
When the keyboard is hidden, the suggestion strip is never visible. Bug: 8954116 Change-Id: I9f242d07b49ad60b625a22429bb013251e814905
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinIME.java19
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);
}