am 71f4c6b8: Merge "Fix NPE that happens only in some unit tests"

* commit '71f4c6b8eacb210fceb719a0f293d14f359ba4f1':
  Fix NPE that happens only in some unit tests
main
Tadashi G. Takaoka 2014-05-14 10:05:41 +00:00 committed by Android Git Automerger
commit e9f992ff26
1 changed files with 3 additions and 1 deletions

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));
textView.setTextColor(mTabLabelColor);
if (mTabLabelColor != null) {
textView.setTextColor(mTabLabelColor);
}
tspec.setIndicator(textView);
}
host.addTab(tspec);