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

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
parent 8e38607e5c 71f4c6b8ea
commit e9f992ff26
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
View File

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