diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-15 07:09:44 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 07:09:44 +0000 |
| commit | 28289ece59ea85566c0e2b659c65b483052bcd5b (patch) | |
| tree | f23e4538f970d66014aed7d07c484d2c20c2172d /java | |
| parent | e810a266fd477cd69509b3d6e61fb8250191aee6 (diff) | |
| parent | afdcc15ca8ea75f4c5a22d7d25eb5e253bdf1c7f (diff) | |
| download | latinime-28289ece59ea85566c0e2b659c65b483052bcd5b.tar.gz latinime-28289ece59ea85566c0e2b659c65b483052bcd5b.tar.xz latinime-28289ece59ea85566c0e2b659c65b483052bcd5b.zip | |
Merge "Fix NPE in KeyboardSwitcher while orientation change"
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index fc9faa6e3..b7a76944e 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -254,7 +254,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { // Implements {@link KeyboardState.SwitchActions}. @Override public void setEmojiKeyboard() { - final Keyboard keyboard = mKeyboardView.getKeyboard(); + final Keyboard keyboard = mKeyboardLayoutSet.getKeyboard(KeyboardId.ELEMENT_ALPHABET); mMainKeyboardFrame.setVisibility(View.GONE); mEmojiPalettesView.startEmojiPalettes( mKeyboardTextsSet.getText(KeyboardTextsSet.SWITCH_TO_ALPHA_KEY_LABEL), |