aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-10-03 13:20:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-03 13:20:23 -0700
commit1e7f4089046038684560cf1da8b17fb7837d5ec6 (patch)
tree79751f54627cae3dc5688528a6e51bedf9c15edf /java/src/com/android/inputmethod
parent11587e47af96154f50122cdf9cf3aa8bd58cab0b (diff)
parentb17084a462770d3bb9e3335477ee773b06ca1811 (diff)
downloadlatinime-1e7f4089046038684560cf1da8b17fb7837d5ec6.tar.gz
latinime-1e7f4089046038684560cf1da8b17fb7837d5ec6.tar.xz
latinime-1e7f4089046038684560cf1da8b17fb7837d5ec6.zip
am b17084a4: am 0f75a055: am 431158c9: Turn off emoji palette on JB-MR2
* commit 'b17084a462770d3bb9e3335477ee773b06ca1811': Turn off emoji palette on JB-MR2
Diffstat (limited to 'java/src/com/android/inputmethod')
-rw-r--r--java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
index 4e61edac2..5b8b188e5 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
@@ -153,7 +153,7 @@ 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) {
addShownCategoryId(CATEGORY_ID_PEOPLE);
addShownCategoryId(CATEGORY_ID_OBJECTS);
addShownCategoryId(CATEGORY_ID_NATURE);