Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28af9ed1 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

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

parents b118a9d7 36ccb030

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

+7 −4
Original line number Diff line number Diff line
@@ -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);

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