Merge "Retain Emoji Keyboard after rotation"
commit
77144a645f
|
@ -75,9 +75,7 @@ public class EmojiLayoutParams {
|
||||||
|
|
||||||
public void setActionBarProperties(LinearLayout ll) {
|
public void setActionBarProperties(LinearLayout ll) {
|
||||||
final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) ll.getLayoutParams();
|
final LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) ll.getLayoutParams();
|
||||||
lp.height = mEmojiActionBarHeight;
|
lp.height = mEmojiActionBarHeight - mBottomPadding;
|
||||||
lp.topMargin = 0;
|
|
||||||
lp.bottomMargin = mBottomPadding;
|
|
||||||
ll.setLayoutParams(lp);
|
ll.setLayoutParams(lp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -155,7 +155,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void saveKeyboardState() {
|
public void saveKeyboardState() {
|
||||||
if (getKeyboard() != null) {
|
if (getKeyboard() != null || isShowingEmojiKeyboard()) {
|
||||||
mState.onSaveKeyboardState();
|
mState.onSaveKeyboardState();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue