diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-09-12 09:15:25 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-09-12 09:15:25 -0700 |
| commit | b66ecdeb7f589e2963e3e57768fd1fc71aad16b5 (patch) | |
| tree | a6a165bfca7e7251c2aec05491336c0ad3d1ca7a /java/src | |
| parent | 0d86a015be148723ccae0e88312a82a144ab96a6 (diff) | |
| parent | 28af9ed19ec5dceed631c2c9bd998ff163e963ec (diff) | |
| download | latinime-b66ecdeb7f589e2963e3e57768fd1fc71aad16b5.tar.gz latinime-b66ecdeb7f589e2963e3e57768fd1fc71aad16b5.tar.xz latinime-b66ecdeb7f589e2963e3e57768fd1fc71aad16b5.zip | |
am 28af9ed1: Merge "Suppress emoji tabs on JB-MR2 or previous versions"
* commit '28af9ed19ec5dceed631c2c9bd998ff163e963ec':
Suppress emoji tabs on JB-MR2 or previous versions
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java b/java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java index 3f2fdecf7..98c29259b 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.Context; 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 @@ public final class EmojiKeyboardView extends LinearLayout implements OnTabChange 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); |