am 0f75a055: am 431158c9: Turn off emoji palette on JB-MR2

* commit '0f75a055bcb2503e6efc4a5b3be1404e0a30ff1a':
  Turn off emoji palette on JB-MR2
This commit is contained in:
Satoshi Kataoka 2013-10-03 10:15:51 -07:00 committed by Android Git Automerger
commit b17084a462

View file

@ -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);