From 6fc15b9fc43c791e1fc96e1d5e812ed2e14995ea Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Fri, 11 Oct 2013 19:15:16 +0900 Subject: [PATCH] Fix a bug where emojis would remove the suggestion strip. Bug: 11163495 Change-Id: I23d12c430125cc2a66a6e00715a4c609bb9e2bb1 --- .../inputmethod/keyboard/KeyboardSwitcher.java | 18 +++++++++++++----- .../android/inputmethod/latin/LatinIME.java | 6 ++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 97609837e..b7521b998 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -155,7 +155,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { } public void saveKeyboardState() { - if (getKeyboard() != null || isShowingEmojiKeyboard()) { + if (getKeyboard() != null || isShowingEmojiPalettes()) { mState.onSaveKeyboardState(); } } @@ -316,19 +316,23 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { mState.onCodeInput(code, mLatinIME.getCurrentAutoCapsState()); } - public boolean isShowingEmojiKeyboard() { - return mEmojiPalettesView != null && mEmojiPalettesView.getVisibility() == View.VISIBLE; + private boolean isShowingMainKeyboard() { + return null != mKeyboardView && mKeyboardView.isShown(); + } + + public boolean isShowingEmojiPalettes() { + return mEmojiPalettesView != null && mEmojiPalettesView.isShown(); } public boolean isShowingMoreKeysPanel() { - if (isShowingEmojiKeyboard()) { + if (isShowingEmojiPalettes()) { return false; } return mKeyboardView.isShowingMoreKeysPanel(); } public View getVisibleKeyboardView() { - if (isShowingEmojiKeyboard()) { + if (isShowingEmojiPalettes()) { return mEmojiPalettesView; } return mKeyboardView; @@ -348,6 +352,10 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { } } + public boolean isShowingMainKeyboardOrEmojiPalettes() { + return isShowingMainKeyboard() || isShowingEmojiPalettes(); + } + public View onCreateInputView(final boolean isHardwareAcceleratedDrawingEnabled) { if (mKeyboardView != null) { mKeyboardView.closing(); 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; }