diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-14 10:01:14 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2014-05-14 10:01:15 +0000 |
| commit | 71f4c6b8eacb210fceb719a0f293d14f359ba4f1 (patch) | |
| tree | dd6373e836b390241945acbcde8b4d8ac79e63b8 /java | |
| parent | 08476dc1076cec7758786141bb86b3a5c46e4e35 (diff) | |
| parent | 268bf2cdfe15aa22637603fa9920b2a2769cbcd3 (diff) | |
| download | latinime-71f4c6b8eacb210fceb719a0f293d14f359ba4f1.tar.gz latinime-71f4c6b8eacb210fceb719a0f293d14f359ba4f1.tar.xz latinime-71f4c6b8eacb210fceb719a0f293d14f359ba4f1.zip | |
Merge "Fix NPE that happens only in some unit tests"
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java index a02ff1175..55e8071c1 100644 --- a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java +++ b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java @@ -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); |