commit 3aa8c4cc1f2f39168ac01770431123a3c9a73487
author Satoshi Kataoka <satok@google.com> Wed Oct 09 19:32:43 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 09 19:32:43 2013 -0700
tree 96d1950b67282517d35b31bed5de3d0ea91b53d5
parent 2d8f1ca8c21e1efd72ada123792fde731418232f
parent 3cc9602c578ed43d34462dc0af4d9c0d6847a86f

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

* commit '3cc9602c578ed43d34462dc0af4d9c0d6847a86f':
  Retain Emoji Keyboard after rotation

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

diff --git a/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java b/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java
index 267fad5..71790b7 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java
@@ -75,9 +75,7 @@
 
     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

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 74edd87..ad6e2c0 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -155,7 +155,7 @@
     }
 
     public void saveKeyboardState() {
-        if (getKeyboard() != null) {
+        if (getKeyboard() != null || isShowingEmojiKeyboard()) {
             mState.onSaveKeyboardState();
         }
     }