aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-10-04 05:02:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 05:02:12 -0700
commit3bf2c59881ebdd4cf77099806d26f280046623bf (patch)
tree78055a11e3c015ba88706ae691d5c1783595282e /java/src
parent664f11f2ffee2cfefe12a98bde79673abf909148 (diff)
parent1d188a28fb0930217098fef10937674e24ca5a49 (diff)
downloadlatinime-3bf2c59881ebdd4cf77099806d26f280046623bf.tar.gz
latinime-3bf2c59881ebdd4cf77099806d26f280046623bf.tar.xz
latinime-3bf2c59881ebdd4cf77099806d26f280046623bf.zip
am 1d188a28: Merge "Fix emoji"
* commit '1d188a28fb0930217098fef10937674e24ca5a49': 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;
}