Merge "Fix NPE that happens only in some unit tests"

This commit is contained in:
Tadashi G. Takaoka 2014-05-14 10:01:14 +00:00 committed by Android (Google) Code Review
commit 71f4c6b8ea

View file

@ -153,7 +153,9 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
textView.setText(mEmojiCategory.getCategoryLabel(categoryId));
textView.setTypeface(Typeface.DEFAULT_BOLD);
textView.setContentDescription(mEmojiCategory.getAccessibilityDescription(categoryId));
if (mTabLabelColor != null) {
textView.setTextColor(mTabLabelColor);
}
tspec.setIndicator(textView);
}
host.addTab(tspec);