aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/xml-sw600dp/key_styles_common.xml22
-rw-r--r--java/res/xml-sw768dp/key_styles_common.xml22
-rw-r--r--java/res/xml/key_styles_common.xml22
-rw-r--r--java/res/xml/rows_number_normal.xml2
-rw-r--r--java/res/xml/rows_phone.xml2
5 files changed, 41 insertions, 29 deletions
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 6b06ce77a..a2d2fd827 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -36,34 +36,38 @@
</default>
</switch>
<!-- Functional key styles -->
+ <!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
+ <key-style
+ latin:styleName="baseForShiftKeyStyle"
+ latin:code="!code/key_shift"
+ latin:keyActionFlags="noKeyPreview"
+ latin:keyLabelFlags="preserveCase"
+ latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" />
<switch>
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetAutomaticShifted"
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyIcon="!icon/shift_key_shifted"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="stickyOff" />
+ latin:backgroundType="stickyOff"
+ latin:parentStyle="baseForShiftKeyStyle" />
</case>
<case
latin:keyboardLayoutSetElement="alphabetShiftLocked|alphabetShiftLockShifted"
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyIcon="!icon/shift_key_shifted"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="stickyOn" />
+ latin:backgroundType="stickyOn"
+ latin:parentStyle="baseForShiftKeyStyle" />
</case>
<default>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyIcon="!icon/shift_key"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="stickyOff" />
+ latin:backgroundType="stickyOff"
+ latin:parentStyle="baseForShiftKeyStyle" />
</default>
</switch>
<key-style
diff --git a/java/res/xml-sw768dp/key_styles_common.xml b/java/res/xml-sw768dp/key_styles_common.xml
index 4d10f5b60..e69bc3020 100644
--- a/java/res/xml-sw768dp/key_styles_common.xml
+++ b/java/res/xml-sw768dp/key_styles_common.xml
@@ -35,34 +35,38 @@
latin:keyLabelFlags="hasShiftedLetterHint" />
</default>
</switch>
+ <!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
+ <key-style
+ latin:styleName="baseForShiftKeyStyle"
+ latin:code="!code/key_shift"
+ latin:keyActionFlags="noKeyPreview"
+ latin:keyLabelFlags="preserveCase"
+ latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" />
<switch>
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetAutomaticShifted"
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyIcon="!icon/shift_key_shifted"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="stickyOff" />
+ latin:backgroundType="stickyOff"
+ latin:parentStyle="baseForShiftKeyStyle" />
</case>
<case
latin:keyboardLayoutSetElement="alphabetShiftLocked|alphabetShiftLockShifted"
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyIcon="!icon/shift_key_shifted"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="stickyOn" />
+ latin:backgroundType="stickyOn"
+ latin:parentStyle="baseForShiftKeyStyle" />
</case>
<default>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyIcon="!icon/shift_key"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="stickyOff" />
+ latin:backgroundType="stickyOff"
+ latin:parentStyle="baseForShiftKeyStyle" />
</default>
</switch>
<key-style
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index 0834adf20..6590d0a4c 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -25,34 +25,38 @@
<include
latin:keyboardLayout="@xml/key_styles_f1" />
<!-- Functional key styles -->
+ <!-- Base style for shift key. A single space is used for dummy label in moreKeys. -->
+ <key-style
+ latin:styleName="baseForShiftKeyStyle"
+ latin:code="!code/key_shift"
+ latin:keyActionFlags="noKeyPreview"
+ latin:keyLabelFlags="preserveCase"
+ latin:moreKeys="!noPanelAutoMoreKey!, |!code/key_capslock" />
<switch>
<case
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetAutomaticShifted"
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyIcon="!icon/shift_key_shifted"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="stickyOff" />
+ latin:backgroundType="stickyOff"
+ latin:parentStyle="baseForShiftKeyStyle" />
</case>
<case
latin:keyboardLayoutSetElement="alphabetShiftLocked|alphabetShiftLockShifted"
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyIcon="!icon/shift_key_shifted"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="stickyOn" />
+ latin:backgroundType="stickyOn"
+ latin:parentStyle="baseForShiftKeyStyle" />
</case>
<default>
<key-style
latin:styleName="shiftKeyStyle"
- latin:code="!code/key_shift"
latin:keyIcon="!icon/shift_key"
- latin:keyActionFlags="noKeyPreview"
- latin:backgroundType="stickyOff" />
+ latin:backgroundType="stickyOff"
+ latin:parentStyle="baseForShiftKeyStyle" />
</default>
</switch>
<key-style
diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml
index b77544bc3..291018a14 100644
--- a/java/res/xml/rows_number_normal.xml
+++ b/java/res/xml/rows_number_normal.xml
@@ -117,7 +117,7 @@
<Key
latin:code="0x002F"
latin:keyLabel="/ :"
- latin:moreKeys="!embeddedMoreKey!,:"
+ latin:moreKeys="!noPanelAutoMoreKey!,:"
latin:keyStyle="numKeyStyle" />
</case>
<default>
diff --git a/java/res/xml/rows_phone.xml b/java/res/xml/rows_phone.xml
index 9299c2aa5..d8dcfbd62 100644
--- a/java/res/xml/rows_phone.xml
+++ b/java/res/xml/rows_phone.xml
@@ -70,7 +70,7 @@
latin:keyStyle="num0KeyStyle"
latin:code="0x0030"
latin:keyLabel="0 +"
- latin:moreKeys="!embeddedMoreKey!,+" />
+ latin:moreKeys="!noPanelAutoMoreKey!,+" />
<Key
latin:keyStyle="numSpaceKeyStyle" />
<Key
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-06-02 23:47:03 +0000