aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw600dp
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-08-13 15:54:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-13 15:54:51 +0000
commitaf078ce7b462d4e9340b39060e3a3aa244c38b78 (patch)
tree05ca86f7be05350cb3c2b45c2269ea4acb061491 /java/res/xml-sw600dp
parent9481d088d70bba4747c574ca3901719c0c9b2a36 (diff)
parent1901c331283e2f60e6277a7773a103a447bd31ca (diff)
downloadlatinime-af078ce7b462d4e9340b39060e3a3aa244c38b78.tar.gz
latinime-af078ce7b462d4e9340b39060e3a3aa244c38b78.tar.xz
latinime-af078ce7b462d4e9340b39060e3a3aa244c38b78.zip
am 1901c331: am a94c89e0: Use light emoji icon for Material light tablet keyboard
* commit '1901c331283e2f60e6277a7773a103a447bd31ca': Use light emoji icon for Material light tablet keyboard
Diffstat (limited to 'java/res/xml-sw600dp')
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml2
-rw-r--r--java/res/xml-sw600dp/key_styles_enter.xml1
2 files changed, 1 insertions, 2 deletions
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 877c796c7..1b52b1efd 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -105,7 +105,7 @@
latin:altCode="!code/key_space" />
<key-style
latin:styleName="emojiKeyStyle"
- latin:keySpec="!icon/emoji_key|!code/key_emoji"
+ latin:keySpec="!icon/emoji_normal_key|!code/key_emoji"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index d0167d336..c20523b2a 100644
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ b/java/res/xml-sw600dp/key_styles_enter.xml
@@ -21,7 +21,6 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- TODO: Stop using many conditional cases for keyspec_emoji_key. There are way too many to maintain. -->
<!-- Navigate more keys style -->
<switch>
<!-- latin:passwordInput="true" -->