commit 28af9ed19ec5dceed631c2c9bd998ff163e963ec
author Satoshi Kataoka <satok@google.com> Thu Sep 12 10:58:28 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 12 10:58:29 2013 +0000
tree 2f0184ba4c96147cc00a1d75d56ce1791ae006be
parent b118a9d729b8ea58063a39396f60c7c5aa1c544b
parent 36ccb030ed1c19669116f0bb17d57b3b204fbf04

Merge "Suppress emoji tabs on JB-MR2 or previous versions"

java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java

diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
index 3f2fdec..98c2925 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
@@ -22,6 +22,7 @@
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
+import android.os.Build;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
@@ -177,10 +178,12 @@
         mTabHost = (TabHost)findViewById(R.id.emoji_category_tabhost);
         mTabHost.setup();
         addTab(mTabHost, CATEGORY_RECENTS);
-        addTab(mTabHost, CATEGORY_PEOPLE);
-        addTab(mTabHost, CATEGORY_OBJECTS);
-        addTab(mTabHost, CATEGORY_NATURE);
-        addTab(mTabHost, CATEGORY_PLACES);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            addTab(mTabHost, CATEGORY_PEOPLE);
+            addTab(mTabHost, CATEGORY_OBJECTS);
+            addTab(mTabHost, CATEGORY_NATURE);
+            addTab(mTabHost, CATEGORY_PLACES);
+        }
         addTab(mTabHost, CATEGORY_SYMBOLS);
         addTab(mTabHost, CATEGORY_EMOTICONS);
         mTabHost.setOnTabChangedListener(this);