diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-15 07:12:20 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-15 07:12:20 +0000 |
| commit | b84c9387f446f92a017aa90b4e6e55a86e23aef1 (patch) | |
| tree | f23e4538f970d66014aed7d07c484d2c20c2172d /java/src | |
| parent | 3aec742bb86a68af7fca7452fe801f640824600a (diff) | |
| parent | 28289ece59ea85566c0e2b659c65b483052bcd5b (diff) | |
| download | latinime-b84c9387f446f92a017aa90b4e6e55a86e23aef1.tar.gz latinime-b84c9387f446f92a017aa90b4e6e55a86e23aef1.tar.xz latinime-b84c9387f446f92a017aa90b4e6e55a86e23aef1.zip | |
am 28289ece: Merge "Fix NPE in KeyboardSwitcher while orientation change"
* commit '28289ece59ea85566c0e2b659c65b483052bcd5b':
Fix NPE in KeyboardSwitcher while orientation change
Diffstat (limited to 'java/src')
| -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), |