diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-10-01 23:16:44 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-01 23:16:44 -0700 |
| commit | 319eb1c363a0d443cace14ee41c575a67ecfc93a (patch) | |
| tree | 8386bcd73b42df34eb9ebd4885be0852f15bb87c /java/src | |
| parent | 358e152b1081f0e74693651e9b5137bd6c2dbad6 (diff) | |
| parent | 77144a645f693fd0d73fd2cbe378997c7a339006 (diff) | |
| download | latinime-319eb1c363a0d443cace14ee41c575a67ecfc93a.tar.gz latinime-319eb1c363a0d443cace14ee41c575a67ecfc93a.tar.xz latinime-319eb1c363a0d443cace14ee41c575a67ecfc93a.zip | |
am 77144a64: Merge "Retain Emoji Keyboard after rotation"
* commit '77144a645f693fd0d73fd2cbe378997c7a339006':
Retain Emoji Keyboard after rotation
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java b/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java index 267fad5cd..71790b7d6 100644 --- a/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java +++ b/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java @@ -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); } diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java index 74edd87cf..ad6e2c0f2 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java @@ -155,7 +155,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { } public void saveKeyboardState() { - if (getKeyboard() != null) { + if (getKeyboard() != null || isShowingEmojiKeyboard()) { mState.onSaveKeyboardState(); } } |