diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-10-11 11:53:07 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-10-11 11:53:07 +0000 |
| commit | 6d91503727a6d5b4eb942c56ee3f640984ae31a4 (patch) | |
| tree | cc5a4668557f59aee7d19e6c0323968c8c8ab167 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 5fe9ab1cc680bed75160980f69f0a7d33f18fb5a (diff) | |
| parent | 6fc15b9fc43c791e1fc96e1d5e812ed2e14995ea (diff) | |
| download | latinime-6d91503727a6d5b4eb942c56ee3f640984ae31a4.tar.gz latinime-6d91503727a6d5b4eb942c56ee3f640984ae31a4.tar.xz latinime-6d91503727a6d5b4eb942c56ee3f640984ae31a4.zip | |
Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index ccdbd0d4d..35fb53e36 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1261,9 +1261,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen final boolean needsInputViewShown) { // TODO: Modify this if we support suggestions with hard keyboard if (onEvaluateInputViewShown() && mSuggestionStripView != null) { - final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView(); - final boolean inputViewShown = (mainKeyboardView != null) - ? mainKeyboardView.isShown() : false; + final boolean inputViewShown = mKeyboardSwitcher.isShowingMainKeyboardOrEmojiPalettes(); final boolean shouldShowSuggestions = shown && (needsInputViewShown ? inputViewShown : true); if (isFullscreenMode()) { @@ -1329,7 +1327,7 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen if (visibleKeyboardView.isShown()) { // Note that the height of Emoji layout is the same as the height of the main keyboard // and the suggestion strip - if (mKeyboardSwitcher.isShowingEmojiKeyboard() + if (mKeyboardSwitcher.isShowingEmojiPalettes() || mSuggestionStripView.getVisibility() == View.VISIBLE) { visibleTopY -= suggestionsHeight; } |