aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/values
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-08-06 05:35:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-06 05:35:14 +0000
commitcc38bfb5d3bc48fae1a789d35441e96fd3d0d63c (patch)
tree0e40a92efb90be74d49acb6d9ff26608469a8427 /java/res/values
parentdaab5cafd288da696e9e9776eb0da8bd0863dcf7 (diff)
parentb127d882854d81a47473b344a1e5f277866bbf22 (diff)
downloadlatinime-cc38bfb5d3bc48fae1a789d35441e96fd3d0d63c.tar.gz
latinime-cc38bfb5d3bc48fae1a789d35441e96fd3d0d63c.tar.xz
latinime-cc38bfb5d3bc48fae1a789d35441e96fd3d0d63c.zip
Merge "Add emoji icon and code as a groundwork"
Diffstat (limited to 'java/res/values')
-rw-r--r--java/res/values/attrs.xml1
-rw-r--r--java/res/values/keyboard-icons-black.xml1
-rw-r--r--java/res/values/keyboard-icons-ics.xml1
-rw-r--r--java/res/values/keyboard-icons-white.xml1
4 files changed, 4 insertions, 0 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index b054e0303..eef9116da 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -216,6 +216,7 @@
<attr name="iconLanguageSwitchKey" format="reference" />
<attr name="iconZwnjKey" format="reference" />
<attr name="iconZwjKey" format="reference" />
+ <attr name="iconEmojiKey" format="reference" />
</declare-styleable>
<declare-styleable name="Keyboard_Key">
diff --git a/java/res/values/keyboard-icons-black.xml b/java/res/values/keyboard-icons-black.xml
index e9c5733b5..c1b1b6573 100644
--- a/java/res/values/keyboard-icons-black.xml
+++ b/java/res/values/keyboard-icons-black.xml
@@ -39,5 +39,6 @@
<!-- TODO: Needs dedicated black theme ZWNJ and ZWJ icons -->
<item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item>
<item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item>
+ <item name="iconEmojiKey">@drawable/ic_emoji_light</item>
</style>
</resources>
diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml
index 8eba196de..5ada27ae8 100644
--- a/java/res/values/keyboard-icons-ics.xml
+++ b/java/res/values/keyboard-icons-ics.xml
@@ -36,5 +36,6 @@
<item name="iconLanguageSwitchKey">@drawable/sym_keyboard_language_switch</item>
<item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item>
<item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item>
+ <item name="iconEmojiKey">@drawable/ic_emoji_light</item>
</style>
</resources>
diff --git a/java/res/values/keyboard-icons-white.xml b/java/res/values/keyboard-icons-white.xml
index e52099867..7c6de42fa 100644
--- a/java/res/values/keyboard-icons-white.xml
+++ b/java/res/values/keyboard-icons-white.xml
@@ -35,5 +35,6 @@
<!-- TODO: Needs dedicated black theme ZWNJ and ZWJ icons -->
<item name="iconZwnjKey">@drawable/sym_keyboard_zwnj_holo</item>
<item name="iconZwjKey">@drawable/sym_keyboard_zwj_holo</item>
+ <item name="iconEmojiKey">@drawable/ic_emoji_dark</item>
</style>
</resources>