nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 28af9ed1: Merge "Suppress emoji tabs on JB-MR2 or previous versions" 

* commit '28af9ed19ec5dceed631c2c9bd998ff163e963ec':
  Suppress emoji tabs on JB-MR2 or previous versions
main
Satoshi Kataoka 2013-09-12 09:15:25 -07:00 committed by Android Git Automerger
parent 0d86a015be 28af9ed19e
commit b66ecdeb7f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/keyboard/EmojiKeyboardView.java
View File

@ -22,6 +22,7 @@ import android.content.Context;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.os.Build;
import android.support.v4.view.PagerAdapter; import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.util.AttributeSet; 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 = (TabHost)findViewById(R.id.emoji_category_tabhost);
mTabHost.setup(); mTabHost.setup();
addTab(mTabHost, CATEGORY_RECENTS); addTab(mTabHost, CATEGORY_RECENTS);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
addTab(mTabHost, CATEGORY_PEOPLE); addTab(mTabHost, CATEGORY_PEOPLE);
addTab(mTabHost, CATEGORY_OBJECTS); addTab(mTabHost, CATEGORY_OBJECTS);
addTab(mTabHost, CATEGORY_NATURE); addTab(mTabHost, CATEGORY_NATURE);
addTab(mTabHost, CATEGORY_PLACES); addTab(mTabHost, CATEGORY_PLACES);
}
addTab(mTabHost, CATEGORY_SYMBOLS); addTab(mTabHost, CATEGORY_SYMBOLS);
addTab(mTabHost, CATEGORY_EMOTICONS); addTab(mTabHost, CATEGORY_EMOTICONS);
mTabHost.setOnTabChangedListener(this); mTabHost.setOnTabChangedListener(this);