aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-05-15 16:07:15 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-05-15 16:07:15 +0900
commitafdcc15ca8ea75f4c5a22d7d25eb5e253bdf1c7f (patch)
treebda52b6a7514248a046b0509a2572bc7551528f4 /java
parent50c21b5e9296a2cbde2ccd2b488f890f42291104 (diff)
downloadlatinime-afdcc15ca8ea75f4c5a22d7d25eb5e253bdf1c7f.tar.gz
latinime-afdcc15ca8ea75f4c5a22d7d25eb5e253bdf1c7f.tar.xz
latinime-afdcc15ca8ea75f4c5a22d7d25eb5e253bdf1c7f.zip
Fix NPE in KeyboardSwitcher while orientation change
This is a follow up of I8a737e2b73. Bug: 14981300 Bug: 14419121 Change-Id: I87f910adbff248d9606d074c351aa951c9539163
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java2
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),