aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw600dp
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-05-24 13:45:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-24 13:45:20 +0000
commit795f7c8f4bb5a95b93d2c08c4c01074637b358cd (patch)
tree70836404f01d828017cb76938ee5eb903ca97dc0 /java/res/xml-sw600dp
parent08acd8c06a9e8fe6b2dc7e102693cf7f72e78636 (diff)
parent1f217dbd517af9e094aee1a1fb5085e8933892c3 (diff)
downloadlatinime-795f7c8f4bb5a95b93d2c08c4c01074637b358cd.tar.gz
latinime-795f7c8f4bb5a95b93d2c08c4c01074637b358cd.tar.xz
latinime-795f7c8f4bb5a95b93d2c08c4c01074637b358cd.zip
am 1f217dbd: Use functional key background for action key with label
* commit '1f217dbd517af9e094aee1a1fb5085e8933892c3': Use functional key background for action key with label
Diffstat (limited to 'java/res/xml-sw600dp')
-rw-r--r--java/res/xml-sw600dp/key_styles_enter.xml15
1 files changed, 9 insertions, 6 deletions
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index 742bb3ec3..34396252d 100644
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ b/java/res/xml-sw600dp/key_styles_enter.xml
@@ -131,7 +131,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_go_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -150,7 +149,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_next_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -169,7 +167,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_previous_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -188,7 +185,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_done_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -207,11 +203,11 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_send_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
+ latin:isIconDefined="search_key"
>
<key-style
latin:styleName="enterKeyStyle"
@@ -220,13 +216,20 @@
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
+ latin:imeAction="actionSearch"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keySpec="!text/label_search_key|!code/key_enter"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ </case>
+ <case
latin:imeAction="actionCustomLabel"
>
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="dummy_label|!code/key_enter"
latin:keyLabelFlags="fromCustomActionLabel"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<!-- imeAction is either actionNone or actionUnspecified. -->