commit 71f4c6b8eacb210fceb719a0f293d14f359ba4f1
author Tadashi G. Takaoka <takaoka@google.com> Wed May 14 10:01:14 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 14 10:01:15 2014 +0000
tree dd6373e836b390241945acbcde8b4d8ac79e63b8
parent 08476dc1076cec7758786141bb86b3a5c46e4e35
parent 268bf2cdfe15aa22637603fa9920b2a2769cbcd3

Merge "Fix NPE that happens only in some unit tests"

java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java

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);