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

* commit 'b17084a462770d3bb9e3335477ee773b06ca1811':
  Turn off emoji palette on JB-MR2
main
Satoshi Kataoka 2013-10-03 13:20:23 -07:00 committed by Android Git Automerger
commit 1e7f408904
1 changed files with 1 additions and 1 deletions

View File

@ -153,7 +153,7 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange
mCategoryNameToIdMap.put(sCategoryName[i], i); mCategoryNameToIdMap.put(sCategoryName[i], i);
} }
addShownCategoryId(CATEGORY_ID_RECENTS); 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_PEOPLE);
addShownCategoryId(CATEGORY_ID_OBJECTS); addShownCategoryId(CATEGORY_ID_OBJECTS);
addShownCategoryId(CATEGORY_ID_NATURE); addShownCategoryId(CATEGORY_ID_NATURE);