commit 5169937dd48d69e52e647662cb6fc3def5bf90d4
author Satoshi Kataoka <satok@google.com> Fri Aug 30 10:28:01 2013 +0000
committer Satoshi Kataoka <satok@google.com> Fri Aug 30 19:46:10 2013 +0900
tree 06d8994729aca4e4bf53b69c8a83868ee9331557
parent 9f79cf6de4eac149ffb496bea34b9d091bed7bc4

Revert "Revert "Support Emoji keyboard""

Window resizing junkiness is addressed in I605e657c9468

This reverts commit aabc97233826da69edbadfc7c1465a505a1fe2ec.

Change-Id: I0bc0f1ad9a90799e643fe9ec35f5b4bbe94eee0d

java/res/values/themes-common.xml

diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index 473a125..8e9cfc9 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -104,7 +104,14 @@
     <style
         name="MainKeyboardView"
         parent="KeyboardView" />
-    <style name="EmojiKeyboardView" />
+    <!-- Though {@link EmojiKeyboardView} doesn't extend {@link KeyboardView}, some views inside it,
+         for instance delete button, need themed {@link KeyboardView} attributes. -->
+    <style
+        name="EmojiKeyboardView"
+        parent="KeyboardView"
+    >
+        <item name="emojiTabLabelColor">@color/emoji_tab_label_color_ics</item>
+    </style>
     <style name="MoreKeysKeyboard" />
     <style
         name="MoreKeysKeyboardView"