aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-05-14 18:55:14 +0900
committerTadashi G. Takaoka <takaoka@google.com>2014-05-14 18:55:14 +0900
commit268bf2cdfe15aa22637603fa9920b2a2769cbcd3 (patch)
treec19c9758b719b85ec56a265d56958c5bad1c1193 /java/src
parent83da26422c30d216eb1725ce1053b0ba3df10e92 (diff)
downloadlatinime-268bf2cdfe15aa22637603fa9920b2a2769cbcd3.tar.gz
latinime-268bf2cdfe15aa22637603fa9920b2a2769cbcd3.tar.xz
latinime-268bf2cdfe15aa22637603fa9920b2a2769cbcd3.zip
Fix NPE that happens only in some unit tests
Bug: 14922410 Change-Id: Ica801e102d302e9faa7c24721b37634f1e812af3
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java4
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);