aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-10-09 20:33:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-09 20:33:33 -0700
commit605bca9bd0d4e9ca5012a9e8ba7d9c86c3264c1d (patch)
tree79535c2113d130c9b07d8af35cc35e066ca8454b /java/src
parentb7c0e1a0ac6e5f71d7aa347b83d781e5a76de81e (diff)
parentf12df9e4017e9064cd5fafb2784a5e4182c6735c (diff)
downloadlatinime-605bca9bd0d4e9ca5012a9e8ba7d9c86c3264c1d.tar.gz
latinime-605bca9bd0d4e9ca5012a9e8ba7d9c86c3264c1d.tar.xz
latinime-605bca9bd0d4e9ca5012a9e8ba7d9c86c3264c1d.zip
am f12df9e4: am 3bf2c598: am 1d188a28: Merge "Fix emoji"
* commit 'f12df9e4017e9064cd5fafb2784a5e4182c6735c': Fix emoji
Diffstat (limited to 'java/src')
-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;
}