commit | 268bf2cdfe15aa22637603fa9920b2a2769cbcd3 | [log] [tgz] |
---|---|---|
author | Tadashi G. Takaoka <takaoka@google.com> | Wed May 14 18:55:14 2014 +0900 |
committer | Tadashi G. Takaoka <takaoka@google.com> | Wed May 14 18:55:14 2014 +0900 |
tree | c19c9758b719b85ec56a265d56958c5bad1c1193 | |
parent | 83da26422c30d216eb1725ce1053b0ba3df10e92 [diff] |
Fix NPE that happens only in some unit tests Bug: 14922410 Change-Id: Ica801e102d302e9faa7c24721b37634f1e812af3
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java index a02ff11..55e8071 100644 --- a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java +++ b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
@@ -153,7 +153,9 @@ 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);