aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-08-26 05:42:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-26 05:42:52 +0000
commit7308c36a55b6fe2b10dc3979d068775920a40890 (patch)
tree59a82b94f6ecc7033d6a7c21ea3d92ceb4c4bdde /java/res
parentaf9c8892da111f1843ec400d6ce77b92ce397f95 (diff)
parent68b990e7ce2b87a6f83cc4fedec7b1cc26ced60c (diff)
downloadlatinime-7308c36a55b6fe2b10dc3979d068775920a40890.tar.gz
latinime-7308c36a55b6fe2b10dc3979d068775920a40890.tar.xz
latinime-7308c36a55b6fe2b10dc3979d068775920a40890.zip
Merge "Add emoji keyboard element ids"
Diffstat (limited to 'java/res')
-rw-r--r--java/res/values/attrs.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 3512686d0..4c5097654 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -373,6 +373,13 @@
<enum name="phone" value="7" />
<enum name="phoneSymbols" value="8" />
<enum name="number" value="9" />
+ <enum name="emojiRecents" value="10" />
+ <enum name="emojiCategory1" value="11" />
+ <enum name="emojiCategory2" value="12" />
+ <enum name="emojiCategory3" value="13" />
+ <enum name="emojiCategory4" value="14" />
+ <enum name="emojiCategory5" value="15" />
+ <enum name="emojiCategory6" value="16" />
</attr>
<!-- This should be aligned with KeyboardId.MODE_* -->
<attr name="mode" format="enum|string">
@@ -427,6 +434,13 @@
<enum name="phone" value="7" />
<enum name="phoneSymbols" value="8" />
<enum name="number" value="9" />
+ <enum name="emojiRecents" value="10" />
+ <enum name="emojiCategory1" value="11" />
+ <enum name="emojiCategory2" value="12" />
+ <enum name="emojiCategory3" value="13" />
+ <enum name="emojiCategory4" value="14" />
+ <enum name="emojiCategory5" value="15" />
+ <enum name="emojiCategory6" value="16" />
</attr>
<attr name="elementKeyboard" format="reference"/>
<!-- Enable proximity characters correction. Disabled by default. -->