Use functional key background for action key with label
This CL also adds label_search_key string resources for consistency.
Bug: 15135033
Change-Id: I81cae243e83a590ef56fe758a43c7184fc4159aa
diff --git a/java/res/values/strings-action-keys.xml b/java/res/values/strings-action-keys.xml
index 7003784..96b2e7d 100644
--- a/java/res/values/strings-action-keys.xml
+++ b/java/res/values/strings-action-keys.xml
@@ -29,6 +29,8 @@
<string name="label_done_key">Done</string>
<!-- Label for soft enter key when it performs SEND action. Must be short to fit on key. 5 chars or less is preferable. [CHAR LIMIT=7] -->
<string name="label_send_key">Send</string>
+ <!-- Label for soft enter key when it performs SEARCH action. Must be short to fit on key. 5 chars or less is preferable. [CHAR LIMIT=7] -->
+ <string name="label_search_key">Search</string>
<!-- Label for "Pause" key of phone number keyboard. Must be short to fit on key. 5 chars or less is preferable. [CHAR LIMIT=7] -->
<string name="label_pause_key">Pause</string>
<!-- Label for "Wait" key of phone number keyboard. Must be short to fit on key. 5 chars or less is preferable. [CHAR LIMIT=7]-->
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index 742bb3e..3439625 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,6 +203,15 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_send_key|!code/key_enter"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionSearch"
+ latin:isIconDefined="search_key"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keySpec="!icon/search_key|!code/key_enter"
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
@@ -215,8 +220,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keySpec="!icon/search_key|!code/key_enter"
- latin:backgroundType="action"
+ latin:keySpec="!text/label_search_key|!code/key_enter"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -226,7 +230,6 @@
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. -->
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index 1d46dd5..8add316 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -298,7 +298,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_go_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -317,7 +316,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_next_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -336,7 +334,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_previous_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -355,7 +352,6 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_done_key|!code/key_enter"
- latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -374,6 +370,15 @@
<key-style
latin:styleName="enterKeyStyle"
latin:keySpec="!text/label_send_key|!code/key_enter"
+ latin:parentStyle="defaultEnterKeyStyle" />
+ </case>
+ <case
+ latin:imeAction="actionSearch"
+ latin:isIconDefined="search_key"
+ >
+ <key-style
+ latin:styleName="enterKeyStyle"
+ latin:keySpec="!icon/search_key|!code/key_enter"
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
@@ -382,8 +387,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keySpec="!icon/search_key|!code/key_enter"
- latin:backgroundType="action"
+ latin:keySpec="!text/label_search_key|!code/key_enter"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -393,7 +397,6 @@
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. -->