aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-10-09 18:55:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-09 18:55:00 -0700
commitf12df9e4017e9064cd5fafb2784a5e4182c6735c (patch)
tree79535c2113d130c9b07d8af35cc35e066ca8454b /java/src/com/android/inputmethod
parent383da922a64e33d72907ead6ac8771ad3b98856a (diff)
parent3bf2c59881ebdd4cf77099806d26f280046623bf (diff)
downloadlatinime-f12df9e4017e9064cd5fafb2784a5e4182c6735c.tar.gz
latinime-f12df9e4017e9064cd5fafb2784a5e4182c6735c.tar.xz
latinime-f12df9e4017e9064cd5fafb2784a5e4182c6735c.zip
am 3bf2c598: am 1d188a28: Merge "Fix emoji"
* commit '3bf2c59881ebdd4cf77099806d26f280046623bf': Fix emoji
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java b/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java
index 71790b7d6..ceb44e79f 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiLayoutParams.java
@@ -56,7 +56,7 @@ public class EmojiLayoutParams {
- (mKeyVerticalGap - mBottomPadding) / 2;
mEmojiPagerHeight = defaultKeyboardHeight - mEmojiActionBarHeight
- mEmojiCategoryPageIdViewHeight;
- mEmojiPagerBottomMargin = mKeyVerticalGap / 2;
+ mEmojiPagerBottomMargin = 0;
mEmojiKeyboardHeight = mEmojiPagerHeight - mEmojiPagerBottomMargin - 1;
}