am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation"
* commit '319eb1c363a0d443cace14ee41c575a67ecfc93a': Retain Emoji Keyboard after rotationmain
commit
3cc9602c57
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -155,7 +155,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
|
|||
}
|
||||
|
||||
public void saveKeyboardState() {
|
||||
if (getKeyboard() != null) {
|
||||
if (getKeyboard() != null || isShowingEmojiKeyboard()) {
|
||||
mState.onSaveKeyboardState();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue