diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-10-03 13:20:36 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 13:20:36 -0700 |
| commit | 652fcd56052496dd8e0d33d36b0827723c1a85bf (patch) | |
| tree | 019fa7c2738b9e27807418865e9cc11d15234ebe /java/src/com/android/inputmethod | |
| parent | e39df0b274ef2a97fe312b27520746207d6c01f8 (diff) | |
| parent | 95c7dfd05abeb9a8802126208b94927561b54a9d (diff) | |
| download | latinime-652fcd56052496dd8e0d33d36b0827723c1a85bf.tar.gz latinime-652fcd56052496dd8e0d33d36b0827723c1a85bf.tar.xz latinime-652fcd56052496dd8e0d33d36b0827723c1a85bf.zip | |
am 95c7dfd0: am 5512b300: am 1e69f3e6: Fix emoji page
* commit '95c7dfd05abeb9a8802126208b94927561b54a9d':
Fix emoji page
Diffstat (limited to 'java/src/com/android/inputmethod')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java index 5b8b188e5..61dc56ed1 100644 --- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java @@ -153,7 +153,9 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange mCategoryNameToIdMap.put(sCategoryName[i], i); } addShownCategoryId(CATEGORY_ID_RECENTS); - if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2) { + if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2 + || android.os.Build.VERSION.CODENAME.equalsIgnoreCase("KeyLimePie") + || android.os.Build.VERSION.CODENAME.equalsIgnoreCase("KitKat")) { addShownCategoryId(CATEGORY_ID_PEOPLE); addShownCategoryId(CATEGORY_ID_OBJECTS); addShownCategoryId(CATEGORY_ID_NATURE); |