nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 3cc9602c: am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation" 

* commit '3cc9602c578ed43d34462dc0af4d9c0d6847a86f':
  Retain Emoji Keyboard after rotation
main
Satoshi Kataoka 2013-10-09 19:32:43 -07:00 committed by Android Git Automerger
parent 2d8f1ca8c2 3cc9602c57
commit 3aa8c4cc1f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java
View File

@ -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);
} }

2
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -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();
} }
} }