Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28289ece authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in KeyboardSwitcher while orientation change"

parents e810a266 afdcc15c

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -254,7 +254,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { 
    // Implements {@link KeyboardState.SwitchActions}.

    // Implements {@link KeyboardState.SwitchActions}.

    @Override

    @Override

    public void setEmojiKeyboard() {

    public void setEmojiKeyboard() {

        final Keyboard keyboard = mKeyboardView.getKeyboard();

        final Keyboard keyboard = mKeyboardLayoutSet.getKeyboard(KeyboardId.ELEMENT_ALPHABET);

        mMainKeyboardFrame.setVisibility(View.GONE);

        mMainKeyboardFrame.setVisibility(View.GONE);

        mEmojiPalettesView.startEmojiPalettes(

        mEmojiPalettesView.startEmojiPalettes(

                mKeyboardTextsSet.getText(KeyboardTextsSet.SWITCH_TO_ALPHA_KEY_LABEL),

                mKeyboardTextsSet.getText(KeyboardTextsSet.SWITCH_TO_ALPHA_KEY_LABEL),