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

Commit 77144a64 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Retain Emoji Keyboard after rotation"

parents e95262a8 5ceae026

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

+1 −3
Original line number Diff line number Diff line
@@ -75,9 +75,7 @@ public class EmojiLayoutParams { 


    public void setActionBarProperties(LinearLayout ll) {

        final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) ll.getLayoutParams();

        lp.height = mEmojiActionBarHeight;

        lp.topMargin = 0;

        lp.bottomMargin = mBottomPadding;

        lp.height = mEmojiActionBarHeight - mBottomPadding;

        ll.setLayoutParams(lp);

    }

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

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



    public void saveKeyboardState() {

        if (getKeyboard() != null) {

        if (getKeyboard() != null || isShowingEmojiKeyboard()) {

            mState.onSaveKeyboardState();

        }

    }