nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 244eca38: Merge "Fix emoji keyboard insets" 

* commit '244eca3809317ebe3b9a7c4ecc73c04beac2b87e':
  Fix emoji keyboard insets
main
Satoshi Kataoka 2013-09-12 22:27:19 -07:00 committed by Android Git Automerger
parent c9e21e82da 244eca3809
commit 786f9243aa
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -314,15 +314,19 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
mState.onCodeInput(code, mLatinIME.getCurrentAutoCapsState()); mState.onCodeInput(code, mLatinIME.getCurrentAutoCapsState());
} }
public boolean isShowingEmojiKeyboard() {
return mEmojiKeyboardView.getVisibility() == View.VISIBLE;
}
public boolean isShowingMoreKeysPanel() { public boolean isShowingMoreKeysPanel() {
if (mEmojiKeyboardView.getVisibility() == View.VISIBLE) { if (isShowingEmojiKeyboard()) {
return false; return false;
} }
return mKeyboardView.isShowingMoreKeysPanel(); return mKeyboardView.isShowingMoreKeysPanel();
} }
public View getVisibleKeyboardView() { public View getVisibleKeyboardView() {
if (mEmojiKeyboardView.getVisibility() == View.VISIBLE) { if (isShowingEmojiKeyboard()) {
return mEmojiKeyboardView; return mEmojiKeyboardView;
} }
return mKeyboardView; return mKeyboardView;

5
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -1234,7 +1234,10 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
int visibleTopY = extraHeight; int visibleTopY = extraHeight;
// Need to set touchable region only if input view is being shown // Need to set touchable region only if input view is being shown
if (visibleKeyboardView.isShown()) { 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; visibleTopY -= suggestionsHeight;
} }
final int touchY = mKeyboardSwitcher.isShowingMoreKeysPanel() ? 0 : visibleTopY; final int touchY = mKeyboardSwitcher.isShowingMoreKeysPanel() ? 0 : visibleTopY;