Merge "Fix NPE that happens only in some unit tests"
This commit is contained in:
commit
71f4c6b8ea
1 changed files with 3 additions and 1 deletions
|
@ -153,7 +153,9 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
|
||||||
textView.setText(mEmojiCategory.getCategoryLabel(categoryId));
|
textView.setText(mEmojiCategory.getCategoryLabel(categoryId));
|
||||||
textView.setTypeface(Typeface.DEFAULT_BOLD);
|
textView.setTypeface(Typeface.DEFAULT_BOLD);
|
||||||
textView.setContentDescription(mEmojiCategory.getAccessibilityDescription(categoryId));
|
textView.setContentDescription(mEmojiCategory.getAccessibilityDescription(categoryId));
|
||||||
textView.setTextColor(mTabLabelColor);
|
if (mTabLabelColor != null) {
|
||||||
|
textView.setTextColor(mTabLabelColor);
|
||||||
|
}
|
||||||
tspec.setIndicator(textView);
|
tspec.setIndicator(textView);
|
||||||
}
|
}
|
||||||
host.addTab(tspec);
|
host.addTab(tspec);
|
||||||
|
|
Loading…
Reference in a new issue