diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-09-13 05:25:33 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-09-13 05:25:33 +0000 |
| commit | 244eca3809317ebe3b9a7c4ecc73c04beac2b87e (patch) | |
| tree | 16cd13e4b13c3dc261f99b9ee3fc96de346899d7 /java/src/com/android/inputmethod/latin/LatinIME.java | |
| parent | 1f9c5bde73fc3c4a2926fc6d7d733f56c380d9f9 (diff) | |
| parent | 898dbe3c29dc46707897f41dd37845ecaf310b92 (diff) | |
| download | latinime-244eca3809317ebe3b9a7c4ecc73c04beac2b87e.tar.gz latinime-244eca3809317ebe3b9a7c4ecc73c04beac2b87e.tar.xz latinime-244eca3809317ebe3b9a7c4ecc73c04beac2b87e.zip | |
Merge "Fix emoji keyboard insets"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinIME.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index cdd6c92e4..5657ed779 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -1234,7 +1234,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen int visibleTopY = extraHeight; // Need to set touchable region only if input view is being shown if (visibleKeyboardView.isShown()) { - if (mSuggestionStripView.getVisibility() == View.VISIBLE) { + // Note that the height of Emoji layout is the same as the height of the main keyboard + // and the suggestion strip + if (mKeyboardSwitcher.isShowingEmojiKeyboard() + || mSuggestionStripView.getVisibility() == View.VISIBLE) { visibleTopY -= suggestionsHeight; } final int touchY = mKeyboardSwitcher.isShowingMoreKeysPanel() ? 0 : visibleTopY; |