commit 28289ece59ea85566c0e2b659c65b483052bcd5b
author Tadashi G. Takaoka <takaoka@google.com> Thu May 15 07:09:44 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 15 07:09:44 2014 +0000
tree f23e4538f970d66014aed7d07c484d2c20c2172d
parent e810a266fd477cd69509b3d6e61fb8250191aee6
parent afdcc15ca8ea75f4c5a22d7d25eb5e253bdf1c7f

Merge "Fix NPE in KeyboardSwitcher while orientation change"

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

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index fc9faa6..b7a7694 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -254,7 +254,7 @@
     // 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),