Merge "Fix NPE in KeyboardSwitcher while orientation change"

main
Tadashi G. Takaoka 2014-05-15 07:09:44 +00:00 committed by Android (Google) Code Review
commit 28289ece59
1 changed files with 1 additions and 1 deletions

View File

@ -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),