aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw600dp
diff options
context:
space:
mode:
Diffstat (limited to 'java/res/xml-sw600dp')
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml1
-rw-r--r--java/res/xml-sw600dp/key_styles_enter.xml138
-rw-r--r--java/res/xml-sw600dp/rows_number_normal.xml5
-rw-r--r--java/res/xml-sw600dp/rows_phone.xml5
4 files changed, 39 insertions, 110 deletions
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index c750a9319..006cda370 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -86,6 +86,7 @@
<key-style
latin:styleName="spaceKeyStyle"
latin:keySpec="!icon/space_key|!code/key_space"
+ latin:backgroundType="spacebar"
latin:keyActionFlags="noKeyPreview|enableLongPress" />
<!-- U+200C: ZERO WIDTH NON-JOINER
U+200D: ZERO WIDTH JOINER -->
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index c20523b2a..63ef2f8f9 100644
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ b/java/res/xml-sw600dp/key_styles_enter.xml
@@ -22,20 +22,18 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- Navigate more keys style -->
+ <include latin:keyboardLayout="@xml/key_styles_navigate_more_keys" />
<switch>
- <!-- latin:passwordInput="true" -->
<case
latin:imeAction="actionNext"
latin:navigatePrevious="true"
>
<key-style
latin:styleName="navigateMoreKeysStyle"
- latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/keyspec_action_previous" />
+ latin:parentStyle="navigatePreviousMoreKeysStyle" />
</case>
<case
latin:imeAction="actionNext"
- latin:navigatePrevious="false"
>
<key-style
latin:styleName="navigateMoreKeysStyle" />
@@ -46,12 +44,10 @@
>
<key-style
latin:styleName="navigateMoreKeysStyle"
- latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/keyspec_action_next" />
+ latin:parentStyle="navigateNextMoreKeysStyle" />
</case>
<case
latin:imeAction="actionPrevious"
- latin:navigateNext="false"
>
<key-style
latin:styleName="navigateMoreKeysStyle" />
@@ -62,47 +58,50 @@
>
<key-style
latin:styleName="navigateMoreKeysStyle"
- latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" />
+ latin:parentStyle="navigatePreviousNextMoreKeysStyle" />
</case>
<case
latin:navigateNext="true"
- latin:navigatePrevious="false"
>
<key-style
latin:styleName="navigateMoreKeysStyle"
- latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/keyspec_action_next" />
+ latin:parentStyle="navigateNextMoreKeysStyle" />
</case>
<case
- latin:navigateNext="false"
latin:navigatePrevious="true"
>
<key-style
latin:styleName="navigateMoreKeysStyle"
- latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/keyspec_action_previous" />
+ latin:parentStyle="navigatePreviousMoreKeysStyle" />
</case>
- <case
- latin:navigateNext="false"
- latin:navigatePrevious="false"
- >
+ <default>
<key-style
latin:styleName="navigateMoreKeysStyle" />
+ </default>
+ </switch>
+ <!-- Enter key style -->
+ <switch>
+ <case latin:keyboardTheme="ICS|KLP">
+ <key-style
+ latin:styleName="defaultEnterKeyStyle"
+ latin:keySpec="!icon/enter_key|!code/key_enter"
+ latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="action"
+ latin:parentStyle="navigateMoreKeysStyle" />
</case>
+ <!-- keyboardTheme="LXXLight|LXXDark" -->
<default>
<key-style
- latin:styleName="navigateMoreKeysStyle" />
+ latin:styleName="defaultEnterKeyStyle"
+ latin:keySpec="!icon/enter_key|!code/key_enter"
+ latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor|keepBackgroundAspectRatio"
+ latin:keyActionFlags="noKeyPreview"
+ latin:backgroundType="action"
+ latin:parentStyle="navigateMoreKeysStyle" />
</default>
</switch>
- <!-- Enter key style -->
- <key-style
- latin:styleName="defaultEnterKeyStyle"
- latin:keySpec="!icon/enter_key|!code/key_enter"
- latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio|followFunctionalTextColor"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="action"
- latin:parentStyle="navigateMoreKeysStyle" />
+ <include latin:keyboardLayout="@xml/key_styles_actions" />
<switch>
<!-- Shift + Enter in textMultiLine field. -->
<case
@@ -116,121 +115,52 @@
</case>
<case
latin:imeAction="actionGo"
- latin:isIconDefined="go_key"
- >
- <key-style
- latin:styleName="enterKeyStyle"
- latin:keySpec="!icon/go_key|!code/key_enter"
- latin:backgroundType="action"
- latin:parentStyle="defaultEnterKeyStyle" />
- </case>
- <case
- latin:imeAction="actionGo"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keySpec="!text/label_go_key|!code/key_enter"
- latin:parentStyle="defaultEnterKeyStyle" />
+ latin:parentStyle="goActionKeyStyle" />
</case>
<case
latin:imeAction="actionNext"
- latin:isIconDefined="next_key"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keySpec="!icon/next_key|!code/key_enter"
- latin:backgroundType="action"
- latin:parentStyle="defaultEnterKeyStyle" />
- </case>
- <case
- latin:imeAction="actionNext"
- >
- <key-style
- latin:styleName="enterKeyStyle"
- latin:keySpec="!text/label_next_key|!code/key_enter"
- latin:parentStyle="defaultEnterKeyStyle" />
+ latin:parentStyle="nextActionKeyStyle" />
</case>
<case
latin:imeAction="actionPrevious"
- latin:isIconDefined="previous_key"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keySpec="!icon/previous_key|!code/key_enter"
- latin:backgroundType="action"
- latin:parentStyle="defaultEnterKeyStyle" />
- </case>
- <case
- latin:imeAction="actionPrevious"
- >
- <key-style
- latin:styleName="enterKeyStyle"
- latin:keySpec="!text/label_previous_key|!code/key_enter"
- latin:parentStyle="defaultEnterKeyStyle" />
+ latin:parentStyle="previousActionKeyStyle" />
</case>
<case
latin:imeAction="actionDone"
- latin:isIconDefined="done_key"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keySpec="!icon/done_key|!code/key_enter"
- latin:backgroundType="action"
- latin:parentStyle="defaultEnterKeyStyle" />
- </case>
- <case
- latin:imeAction="actionDone"
- >
- <key-style
- latin:styleName="enterKeyStyle"
- latin:keySpec="!text/label_done_key|!code/key_enter"
- latin:parentStyle="defaultEnterKeyStyle" />
+ latin:parentStyle="doneActionKeyStyle" />
</case>
<case
latin:imeAction="actionSend"
- latin:isIconDefined="send_key"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keySpec="!icon/send_key|!code/key_enter"
- latin:backgroundType="action"
- latin:parentStyle="defaultEnterKeyStyle" />
- </case>
- <case
- latin:imeAction="actionSend"
- >
- <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" />
+ latin:parentStyle="sendActionKeyStyle" />
</case>
<case
latin:imeAction="actionSearch"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keySpec="!text/label_search_key|!code/key_enter"
- latin:parentStyle="defaultEnterKeyStyle" />
+ latin:parentStyle="searchActionKeyStyle" />
</case>
<case
latin:imeAction="actionCustomLabel"
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keySpec="dummy_label|!code/key_enter"
- latin:keyLabelFlags="fromCustomActionLabel"
- latin:backgroundType="customAction"
- latin:parentStyle="defaultEnterKeyStyle" />
+ latin:parentStyle="customLabelActionKeyStyle" />
</case>
<!-- imeAction is either actionNone or actionUnspecified. -->
<default>
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
index 757e77933..7a4700d5a 100644
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -141,9 +141,8 @@
</Row>
<Row>
<Key
- latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="30%p"
- latin:backgroundType="functional" />
+ latin:keyStyle="tabletNumSpaceKeyStyle"
+ latin:keyWidth="30%p" />
<Key
latin:keyStyle="numStarKeyStyle"
latin:keyXPos="31%p" />
diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
index 9022bc532..612397a90 100644
--- a/java/res/xml-sw600dp/rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -107,9 +107,8 @@
</Row>
<Row>
<Key
- latin:keyStyle="spaceKeyStyle"
- latin:keyWidth="30%p"
- latin:backgroundType="functional" />
+ latin:keyStyle="tabletNumSpaceKeyStyle"
+ latin:keyWidth="30%p" />
<Key
latin:keyStyle="numStarKeyStyle"
latin:keyXPos="31%p" />
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-05-31 02:52:21 +0000