Merge "Fix emoji keyboard insets" (244eca38) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -314,15 +314,19 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
		mState.onCodeInput(code, mLatinIME.getCurrentAutoCapsState());
		}

		public boolean isShowingEmojiKeyboard() {
		return mEmojiKeyboardView.getVisibility() == View.VISIBLE;
		}

		public boolean isShowingMoreKeysPanel() {
		if (mEmojiKeyboardView.getVisibility() == View.VISIBLE) {
		if (isShowingEmojiKeyboard()) {
		return false;
		}
		return mKeyboardView.isShowingMoreKeysPanel();
		}

		public View getVisibleKeyboardView() {
		if (mEmojiKeyboardView.getVisibility() == View.VISIBLE) {
		if (isShowingEmojiKeyboard()) {
		return mEmojiKeyboardView;
		}
		return mKeyboardView;

+4 −1

Original line number	Diff line number	Diff line
		@@ -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;