diff options
Diffstat (limited to 'java/res/xml')
| -rw-r--r-- | java/res/xml/kbd_key_styles.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwerty_black_symbol.xml | 8 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwerty_f1.xml | 84 | ||||
| -rw-r--r-- | java/res/xml/kbd_qwerty_row3.xml | 8 |
4 files changed, 74 insertions, 28 deletions
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index 473510ec4..ea5d4ccd2 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -28,7 +28,7 @@ > <key-style latin:styleName="functionalKeyStyle" - latin:isModifier="true" /> + latin:isFunctional="true" /> <key-style latin:styleName="shiftKeyStyle" latin:code="@integer/key_shift" diff --git a/java/res/xml/kbd_qwerty_black_symbol.xml b/java/res/xml/kbd_qwerty_black_symbol.xml index 6e45c12bf..69e7e31d2 100644 --- a/java/res/xml/kbd_qwerty_black_symbol.xml +++ b/java/res/xml/kbd_qwerty_black_symbol.xml @@ -38,7 +38,7 @@ latin:keyIcon="@drawable/sym_bkeyboard_123_mic" latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic" latin:keyWidth="20%p" - latin:isModifier="true" + latin:isFunctional="true" latin:keyEdgeFlags="left" /> </case> <default> @@ -46,7 +46,7 @@ latin:code="@integer/key_switch_alpha_symbol" latin:keyLabel="@string/label_to_symbol_key" latin:keyWidth="20%p" - latin:isModifier="true" + latin:isFunctional="true" latin:keyEdgeFlags="left" /> </default> </switch> @@ -67,7 +67,7 @@ latin:keyIcon="@drawable/sym_bkeyboard_123_mic" latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic" latin:keyWidth="15%p" - latin:isModifier="true" + latin:isFunctional="true" latin:keyEdgeFlags="left" /> </case> <default> @@ -75,7 +75,7 @@ latin:code="@integer/key_switch_alpha_symbol" latin:keyLabel="@string/label_to_symbol_key" latin:keyWidth="15%p" - latin:isModifier="true" + latin:isFunctional="true" latin:keyEdgeFlags="left" /> </default> </switch> diff --git a/java/res/xml/kbd_qwerty_f1.xml b/java/res/xml/kbd_qwerty_f1.xml index cbdb8c09a..c93b8605a 100644 --- a/java/res/xml/kbd_qwerty_f1.xml +++ b/java/res/xml/kbd_qwerty_f1.xml @@ -23,40 +23,82 @@ > <switch> <case - latin:mode="url" + latin:hasSettingsKey="true" > - <Key - latin:keyLabel="/" - latin:keyHintIcon="@drawable/hint_popup" - latin:popupCharacters="@string/alternates_for_settings_slash" - latin:isModifier="true" /> - </case> - <case - latin:mode="email" - > - <Key - latin:keyLabel="\@" - latin:keyHintIcon="@drawable/hint_popup" - latin:popupCharacters="@string/alternates_for_settings_at" - latin:isModifier="true" /> + <switch> + <case + latin:mode="url" + > + <Key + latin:keyLabel="/" + latin:isFunctional="true" /> + </case> + <case + latin:mode="email" + > + <Key + latin:keyLabel="\@" + latin:isFunctional="true" /> + </case> + <default> + <switch> + <case + latin:hasVoiceKey="true" + > + <Key + latin:keyStyle="micKeyStyle" /> + </case> + <case + latin:hasVoiceKey="false" + > + <Key + latin:keyLabel="," + latin:isFunctional="true" /> + </case> + </switch> + </default> + </switch> </case> + <!-- latin:hasSettingsKey="false" --> <default> <switch> <case - latin:hasVoiceKey="true" + latin:mode="url" > <Key - latin:keyStyle="micKeyStyle" /> + latin:keyLabel="/" + latin:keyHintIcon="@drawable/hint_popup" + latin:popupCharacters="@string/alternates_for_settings_slash" + latin:isFunctional="true" /> </case> <case - latin:hasVoiceKey="false" + latin:mode="email" > <Key - latin:keyLabel="," + latin:keyLabel="\@" latin:keyHintIcon="@drawable/hint_popup" - latin:popupCharacters="@string/alternates_for_settings_comma" - latin:isModifier="true" /> + latin:popupCharacters="@string/alternates_for_settings_at" + latin:isFunctional="true" /> </case> + <default> + <switch> + <case + latin:hasVoiceKey="true" + > + <Key + latin:keyStyle="micKeyStyle" /> + </case> + <case + latin:hasVoiceKey="false" + > + <Key + latin:keyLabel="," + latin:keyHintIcon="@drawable/hint_popup" + latin:popupCharacters="@string/alternates_for_settings_comma" + latin:isFunctional="true" /> + </case> + </switch> + </default> </switch> </default> </switch> diff --git a/java/res/xml/kbd_qwerty_row3.xml b/java/res/xml/kbd_qwerty_row3.xml index 26608fd71..27016aff0 100644 --- a/java/res/xml/kbd_qwerty_row3.xml +++ b/java/res/xml/kbd_qwerty_row3.xml @@ -26,8 +26,10 @@ > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="15%p" + latin:keyWidth="13%p" latin:keyEdgeFlags="left" /> + <Spacer + latin:horizontalGap="2%p" /> <Key latin:keyLabel="z" latin:popupCharacters="@string/alternates_for_z" /> @@ -46,9 +48,11 @@ latin:popupCharacters="@string/alternates_for_n" /> <Key latin:keyLabel="m" /> + <Spacer + latin:horizontalGap="2%p" /> <Key latin:keyStyle="deleteKeyStyle" - latin:keyWidth="15%p" + latin:keyWidth="13%p" latin:keyEdgeFlags="right" /> </Row> </merge> |