commit 319eb1c363a0d443cace14ee41c575a67ecfc93a
author Satoshi Kataoka <satok@google.com> Tue Oct 01 23:16:44 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 01 23:16:44 2013 -0700
tree 8386bcd73b42df34eb9ebd4885be0852f15bb87c
parent 358e152b1081f0e74693651e9b5137bd6c2dbad6
parent 77144a645f693fd0d73fd2cbe378997c7a339006

am 77144a64: Merge "Retain Emoji Keyboard after rotation"

* commit '77144a645f693fd0d73fd2cbe378997c7a339006':
  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();
         }
     }