Rename Key.keyLabel attribute to KeySpec
Change-Id: Ida48cd9bdbc01fefad651a005084262c0f46c41c
diff --git a/java/res/xml-sw600dp/key_azerty3_right.xml b/java/res/xml-sw600dp/key_azerty3_right.xml
index a5a6e95..25b0e52 100644
--- a/java/res/xml-sw600dp/key_azerty3_right.xml
+++ b/java/res/xml-sw600dp/key_azerty3_right.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel=":"
+ latin:keySpec=":"
latin:keyHintLabel=";"
latin:moreKeys=";"
latin:keyStyle="hasShiftedLetterHintStyle" />
diff --git a/java/res/xml-sw600dp/key_colemak_colon.xml b/java/res/xml-sw600dp/key_colemak_colon.xml
index a5a6e95..25b0e52 100644
--- a/java/res/xml-sw600dp/key_colemak_colon.xml
+++ b/java/res/xml-sw600dp/key_colemak_colon.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel=":"
+ latin:keySpec=":"
latin:keyHintLabel=";"
latin:moreKeys=";"
latin:keyStyle="hasShiftedLetterHintStyle" />
diff --git a/java/res/xml-sw600dp/key_f1.xml b/java/res/xml-sw600dp/key_f1.xml
index 530f7d6..ba78a64 100644
--- a/java/res/xml-sw600dp/key_f1.xml
+++ b/java/res/xml-sw600dp/key_f1.xml
@@ -26,11 +26,11 @@
latin:mode="email"
>
<Key
- latin:keyLabel="\@" />
+ latin:keySpec="\@" />
</case>
<default>
<Key
- latin:keyLabel="/" />
+ latin:keySpec="/" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/key_greek_semicolon.xml b/java/res/xml-sw600dp/key_greek_semicolon.xml
index 3f09419..9e2c1fa 100644
--- a/java/res/xml-sw600dp/key_greek_semicolon.xml
+++ b/java/res/xml-sw600dp/key_greek_semicolon.xml
@@ -22,7 +22,7 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel=";"
+ latin:keySpec=";"
latin:keyHintLabel=":"
latin:moreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
diff --git a/java/res/xml-sw600dp/key_question_exclamation.xml b/java/res/xml-sw600dp/key_question_exclamation.xml
index 860a0be..edee5c5 100644
--- a/java/res/xml-sw600dp/key_question_exclamation.xml
+++ b/java/res/xml-sw600dp/key_question_exclamation.xml
@@ -26,11 +26,11 @@
latin:mode="email|url"
>
<Key
- latin:keyLabel="-" />
+ latin:keySpec="-" />
</case>
<default>
<Key
- latin:keyLabel="\?"
+ latin:keySpec="\?"
latin:keyHintLabel="!"
latin:moreKeys="!"
latin:keyStyle="hasShiftedLetterHintStyle" />
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 4dbc23e..6a79c6f 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -48,7 +48,7 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:keyLabel="!icon/shift_key_shifted|!code/key_shift"
+ latin:keySpec="!icon/shift_key_shifted|!code/key_shift"
latin:backgroundType="stickyOff"
latin:parentStyle="baseForShiftKeyStyle" />
</case>
@@ -57,56 +57,56 @@
>
<key-style
latin:styleName="shiftKeyStyle"
- latin:keyLabel="!icon/shift_key_shifted|!code/key_shift"
+ latin:keySpec="!icon/shift_key_shifted|!code/key_shift"
latin:backgroundType="stickyOn"
latin:parentStyle="baseForShiftKeyStyle" />
</case>
<default>
<key-style
latin:styleName="shiftKeyStyle"
- latin:keyLabel="!icon/shift_key|!code/key_shift"
+ latin:keySpec="!icon/shift_key|!code/key_shift"
latin:backgroundType="stickyOff"
latin:parentStyle="baseForShiftKeyStyle" />
</default>
</switch>
<key-style
latin:styleName="deleteKeyStyle"
- latin:keyLabel="!icon/delete_key|!code/key_delete"
+ latin:keySpec="!icon/delete_key|!code/key_delete"
latin:keyActionFlags="isRepeatable|noKeyPreview"
latin:backgroundType="functional" />
<include
latin:keyboardLayout="@xml/key_styles_enter" />
<key-style
latin:styleName="spaceKeyStyle"
- latin:keyLabel=" |!code/key_space"
+ latin:keySpec=" |!code/key_space"
latin:keyActionFlags="noKeyPreview|enableLongPress" />
<!-- U+200C: ZERO WIDTH NON-JOINER
U+200D: ZERO WIDTH JOINER -->
<key-style
latin:styleName="zwnjKeyStyle"
- latin:keyLabel="!icon/zwnj_key|‌"
+ latin:keySpec="!icon/zwnj_key|‌"
latin:moreKeys="!icon/zwj_key|‍"
latin:keyLabelFlags="hasPopupHint"
latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="shortcutKeyStyle"
- latin:keyLabel="!icon/shortcut_key|!code/key_shortcut"
+ latin:keySpec="!icon/shortcut_key|!code/key_shortcut"
latin:keyIconDisabled="!icon/shortcut_key_disabled"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="languageSwitchKeyStyle"
- latin:keyLabel="!icon/language_switch_key|!code/key_language_switch"
+ latin:keySpec="!icon/language_switch_key|!code/key_language_switch"
latin:keyActionFlags="noKeyPreview|altCodeWhileTyping|enableLongPress"
latin:altCode="!code/key_space" />
<key-style
latin:styleName="emojiKeyStyle"
- latin:keyLabel="!icon/emoji_key|!code/key_emoji"
+ latin:keySpec="!icon/emoji_key|!code/key_emoji"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="settingsKeyStyle"
- latin:keyLabel="!icon/settings_key|!code/key_settings"
+ latin:keySpec="!icon/settings_key|!code/key_settings"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<switch>
@@ -116,7 +116,7 @@
>
<key-style
latin:styleName="tabKeyStyle"
- latin:keyLabel="!icon/tab_key|!code/key_action_previous"
+ latin:keySpec="!icon/tab_key|!code/key_action_previous"
latin:keyIconPreview="!icon/tab_key_preview"
latin:backgroundType="functional" />
</case>
@@ -126,14 +126,14 @@
>
<key-style
latin:styleName="tabKeyStyle"
- latin:keyLabel="!icon/tab_key|!code/key_action_next"
+ latin:keySpec="!icon/tab_key|!code/key_action_next"
latin:keyIconPreview="!icon/tab_key_preview"
latin:backgroundType="functional" />
</case>
<default>
<key-style
latin:styleName="tabKeyStyle"
- latin:keyLabel="!icon/tab_key|!code/key_tab"
+ latin:keySpec="!icon/tab_key|!code/key_tab"
latin:keyIconPreview="!icon/tab_key_preview"
latin:backgroundType="functional" />
</default>
@@ -145,23 +145,23 @@
latin:backgroundType="functional" />
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:keyLabel="!text/label_to_symbol_key|!code/key_switch_alpha_symbol"
+ latin:keySpec="!text/label_to_symbol_key|!code/key_switch_alpha_symbol"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="toAlphaKeyStyle"
- latin:keyLabel="!text/label_to_alpha_key|!code/key_switch_alpha_symbol"
+ latin:keySpec="!text/label_to_alpha_key|!code/key_switch_alpha_symbol"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
- latin:keyLabel="!text/label_to_more_symbol_for_tablet_key|!code/key_shift"
+ latin:keySpec="!text/label_to_more_symbol_for_tablet_key|!code/key_shift"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
- latin:keyLabel="!text/label_to_symbol_key|!code/key_shift"
+ latin:keySpec="!text/label_to_symbol_key|!code/key_shift"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="comKeyStyle"
- latin:keyLabel="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"
+ latin:keySpec="!text/keylabel_for_popular_domain|!text/keylabel_for_popular_domain"
latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
latin:moreKeys="!text/more_keys_for_popular_domain" />
</merge>
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index 39c5380..38a38fd 100644
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ b/java/res/xml-sw600dp/key_styles_enter.xml
@@ -99,7 +99,7 @@
<!-- Enter key style -->
<key-style
latin:styleName="defaultEnterKeyStyle"
- latin:keyLabel="!icon/enter_key|!code/key_enter"
+ latin:keySpec="!icon/enter_key|!code/key_enter"
latin:keyLabelFlags="preserveCase|autoXScale|followKeyLabelRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional"
@@ -112,7 +112,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_go_key|!code/key_shift_enter"
+ latin:keySpec="!text/label_go_key|!code/key_shift_enter"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
<case
@@ -120,7 +120,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_go_key|!code/key_enter"
+ latin:keySpec="!text/label_go_key|!code/key_enter"
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
@@ -129,7 +129,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_next_key|!code/key_enter"
+ latin:keySpec="!text/label_next_key|!code/key_enter"
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
@@ -138,7 +138,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_previous_key|!code/key_enter"
+ latin:keySpec="!text/label_previous_key|!code/key_enter"
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
@@ -147,7 +147,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_done_key|!code/key_enter"
+ latin:keySpec="!text/label_done_key|!code/key_enter"
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
@@ -156,7 +156,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!text/label_send_key|!code/key_enter"
+ latin:keySpec="!text/label_send_key|!code/key_enter"
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
@@ -165,7 +165,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="!icon/search_key|!code/key_enter"
+ latin:keySpec="!icon/search_key|!code/key_enter"
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
</case>
@@ -174,7 +174,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
- latin:keyLabel="dummy_label|!code/key_enter"
+ latin:keySpec="dummy_label|!code/key_enter"
latin:keyLabelFlags="fromCustomActionLabel"
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
diff --git a/java/res/xml-sw600dp/keys_arabic3_left.xml b/java/res/xml-sw600dp/keys_arabic3_left.xml
index 0f2ccc0..9b4031e 100644
--- a/java/res/xml-sw600dp/keys_arabic3_left.xml
+++ b/java/res/xml-sw600dp/keys_arabic3_left.xml
@@ -23,10 +23,10 @@
>
<!-- U+0630: "ذ" ARABIC LETTER THAL -->
<Key
- latin:keyLabel="ذ"
+ latin:keySpec="ذ"
latin:keyLabelFlags="fontNormal" />
<!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
<Key
- latin:keyLabel="ئ"
+ latin:keySpec="ئ"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-sw600dp/keys_comma_period.xml b/java/res/xml-sw600dp/keys_comma_period.xml
index 55302ae..eda96b2 100644
--- a/java/res/xml-sw600dp/keys_comma_period.xml
+++ b/java/res/xml-sw600dp/keys_comma_period.xml
@@ -22,14 +22,14 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="!text/keylabel_for_tablet_comma"
+ latin:keySpec="!text/keylabel_for_tablet_comma"
latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_tablet_comma"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="!text/keylabel_for_tablet_period"
+ latin:keySpec="!text/keylabel_for_tablet_period"
latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_tablet_period"
diff --git a/java/res/xml-sw600dp/keys_dvorak_123.xml b/java/res/xml-sw600dp/keys_dvorak_123.xml
index 58416ab..91ceb1c 100644
--- a/java/res/xml-sw600dp/keys_dvorak_123.xml
+++ b/java/res/xml-sw600dp/keys_dvorak_123.xml
@@ -26,31 +26,31 @@
latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<Key
- latin:keyLabel="""
+ latin:keySpec="""
latin:keyHintLabel="1"
latin:additionalMoreKeys="1" />
<Key
- latin:keyLabel="<"
+ latin:keySpec="<"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2" />
<Key
- latin:keyLabel=">"
+ latin:keySpec=">"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3" />
</case>
<default>
<Key
- latin:keyLabel="\'"
+ latin:keySpec="\'"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="!,"" />
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="\?,<" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
latin:moreKeys=">" />
diff --git a/java/res/xml-sw600dp/keys_exclamation_question.xml b/java/res/xml-sw600dp/keys_exclamation_question.xml
index fd84922..116bef2 100644
--- a/java/res/xml-sw600dp/keys_exclamation_question.xml
+++ b/java/res/xml-sw600dp/keys_exclamation_question.xml
@@ -22,9 +22,9 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="!"
+ latin:keySpec="!"
latin:moreKeys="!text/more_keys_for_exclamation" />
<Key
- latin:keyLabel="\?"
+ latin:keySpec="\?"
latin:moreKeys="!text/more_keys_for_question" />
</merge>
diff --git a/java/res/xml-sw600dp/keys_farsi3_right.xml b/java/res/xml-sw600dp/keys_farsi3_right.xml
index 3c91ae9..45d1286 100644
--- a/java/res/xml-sw600dp/keys_farsi3_right.xml
+++ b/java/res/xml-sw600dp/keys_farsi3_right.xml
@@ -23,10 +23,10 @@
>
<!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
- latin:keyLabel="آ"
+ latin:keySpec="آ"
latin:keyLabelFlags="fontNormal" />
<!-- U+0686: "چ" ARABIC LETTER TCHEH -->
<Key
- latin:keyLabel="چ"
+ latin:keySpec="چ"
latin:keyLabelFlags="fontNormal" />
</merge>
diff --git a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
index 324e025..ab99ec5 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
@@ -26,17 +26,17 @@
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<Key
- latin:keyLabel="["
+ latin:keySpec="["
latin:keyHintLabel="{"
latin:additionalMoreKeys="{"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="]"
+ latin:keySpec="]"
latin:keyHintLabel="}"
latin:additionalMoreKeys="}"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="\\"
+ latin:keySpec="\\"
latin:keyHintLabel="|"
latin:additionalMoreKeys="\\|"
latin:keyStyle="hasShiftedLetterHintStyle" />
@@ -44,11 +44,11 @@
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<Key
- latin:keyLabel="{" />
+ latin:keySpec="{" />
<Key
- latin:keyLabel="}" />
+ latin:keySpec="}" />
<Key
- latin:keyLabel="|" />
+ latin:keySpec="|" />
</default>
</switch>
</merge>
\ No newline at end of file
diff --git a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
index 254b5e5..5443396 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
@@ -26,12 +26,12 @@
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<Key
- latin:keyLabel=";"
+ latin:keySpec=";"
latin:keyHintLabel=":"
latin:additionalMoreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="\'"
+ latin:keySpec="\'"
latin:keyHintLabel="""
latin:additionalMoreKeys="""
latin:keyStyle="hasShiftedLetterHintStyle"
@@ -40,9 +40,9 @@
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<Key
- latin:keyLabel=":" />
+ latin:keySpec=":" />
<Key
- latin:keyLabel="""
+ latin:keySpec="""
latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
</default>
</switch>
diff --git a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
index 46a1c85..c95ca2e 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
@@ -26,17 +26,17 @@
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyHintLabel="<"
latin:additionalMoreKeys="<"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyHintLabel=">"
latin:additionalMoreKeys=">"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="/"
+ latin:keySpec="/"
latin:keyHintLabel="\?"
latin:additionalMoreKeys="\?"
latin:keyStyle="hasShiftedLetterHintStyle"
@@ -51,13 +51,13 @@
U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
- latin:keyLabel="<"
+ latin:keySpec="<"
latin:moreKeys="!fixedColumnOrder!3,‹,≤,«" />
<Key
- latin:keyLabel=">"
+ latin:keySpec=">"
latin:moreKeys="!fixedColumnOrder!3,›,≥,»" />
<Key
- latin:keyLabel="\?"
+ latin:keySpec="\?"
latin:moreKeys="!text/more_keys_for_question" />
</default>
</switch>
diff --git a/java/res/xml-sw600dp/row_dvorak4.xml b/java/res/xml-sw600dp/row_dvorak4.xml
index 11b4034..2ba6a49 100644
--- a/java/res/xml-sw600dp/row_dvorak4.xml
+++ b/java/res/xml-sw600dp/row_dvorak4.xml
@@ -39,7 +39,7 @@
<include
latin:keyboardLayout="@xml/key_question_exclamation" />
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:keyHintLabel="_"
latin:moreKeys="_"
latin:keyStyle="hasShiftedLetterHintStyle" />
diff --git a/java/res/xml-sw600dp/rowkeys_dvorak3.xml b/java/res/xml-sw600dp/rowkeys_dvorak3.xml
index 2148bb2..edc68a3 100644
--- a/java/res/xml-sw600dp/rowkeys_dvorak3.xml
+++ b/java/res/xml-sw600dp/rowkeys_dvorak3.xml
@@ -22,26 +22,26 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="q" />
+ latin:keySpec="q" />
<Key
- latin:keyLabel="j"
+ latin:keySpec="j"
latin:moreKeys="!text/more_keys_for_j" />
<Key
- latin:keyLabel="k"
+ latin:keySpec="k"
latin:moreKeys="!text/more_keys_for_k" />
<Key
- latin:keyLabel="x" />
+ latin:keySpec="x" />
<Key
- latin:keyLabel="b" />
+ latin:keySpec="b" />
<Key
- latin:keyLabel="m" />
+ latin:keySpec="m" />
<Key
- latin:keyLabel="w"
+ latin:keySpec="w"
latin:moreKeys="!text/more_keys_for_w" />
<Key
- latin:keyLabel="v"
+ latin:keySpec="v"
latin:moreKeys="!text/more_keys_for_v" />
<Key
- latin:keyLabel="z"
+ latin:keySpec="z"
latin:moreKeys="!text/more_keys_for_z" />
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
index ae6bab7..5389e22 100644
--- a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
+++ b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
@@ -22,66 +22,66 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keyLabel="`"
+ latin:keySpec="`"
latin:keyHintLabel="~"
latin:additionalMoreKeys="~"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keyLabel="1"
+ latin:keySpec="1"
latin:keyHintLabel="!"
latin:additionalMoreKeys="!"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_exclamation,!text/more_keys_for_symbols_1" />
<Key
- latin:keyLabel="2"
+ latin:keySpec="2"
latin:keyHintLabel="\@"
latin:additionalMoreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_2" />
<Key
- latin:keyLabel="3"
+ latin:keySpec="3"
latin:keyHintLabel="\#"
latin:additionalMoreKeys="\#"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_3" />
<Key
- latin:keyLabel="4"
+ latin:keySpec="4"
latin:keyHintLabel="$"
latin:additionalMoreKeys="$"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_4" />
<Key
- latin:keyLabel="5"
+ latin:keySpec="5"
latin:keyHintLabel="%"
latin:additionalMoreKeys="\\%"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_5" />
<Key
- latin:keyLabel="6"
+ latin:keySpec="6"
latin:keyHintLabel="^"
latin:additionalMoreKeys="^"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_6" />
<Key
- latin:keyLabel="7"
+ latin:keySpec="7"
latin:keyHintLabel="&"
latin:additionalMoreKeys="&"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_7" />
<Key
- latin:keyLabel="8"
+ latin:keySpec="8"
latin:keyHintLabel="*"
latin:additionalMoreKeys="*"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_8" />
<Key
- latin:keyLabel="9"
+ latin:keySpec="9"
latin:keyHintLabel="("
latin:additionalMoreKeys="("
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_9" />
<Key
- latin:keyLabel="0"
+ latin:keySpec="0"
latin:keyHintLabel=")"
latin:additionalMoreKeys=")"
latin:keyStyle="hasShiftedLetterHintStyle"
@@ -90,7 +90,7 @@
U+2014: "—" EM DASH
U+00B7: "·" MIDDLE DOT -->
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:keyHintLabel="_"
latin:additionalMoreKeys="_"
latin:keyStyle="hasShiftedLetterHintStyle"
@@ -99,7 +99,7 @@
U+2260: "≠" NOT EQUAL TO
U+2248: "≈" ALMOST EQUAL TO -->
<Key
- latin:keyLabel="="
+ latin:keySpec="="
latin:keyHintLabel="+"
latin:additionalMoreKeys="+"
latin:keyStyle="hasShiftedLetterHintStyle"
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
index 37bf2e8..15f4cde 100644
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -23,29 +23,29 @@
>
<Row>
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="+"
+ latin:keySpec="+"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="1"
+ latin:keySpec="1"
latin:keyStyle="numKeyStyle"
latin:keyXPos="31%p" />
<Key
- latin:keyLabel="2"
+ latin:keySpec="2"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="3"
+ latin:keySpec="3"
latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -58,7 +58,7 @@
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="/"
+ latin:keySpec="/"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
@@ -67,7 +67,7 @@
latin:mode="time|datetime"
>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_am_pm"
latin:keyStyle="numKeyStyle"
@@ -76,21 +76,21 @@
</case>
<default>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</default>
</switch>
<Key
- latin:keyLabel="4"
+ latin:keySpec="4"
latin:keyStyle="numKeyStyle"
latin:keyXPos="31%p" />
<Key
- latin:keyLabel="5"
+ latin:keySpec="5"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="6"
+ latin:keySpec="6"
latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="enterKeyStyle"
@@ -99,12 +99,12 @@
</Row>
<Row>
<Key
- latin:keyLabel="("
+ latin:keySpec="("
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel=")"
+ latin:keySpec=")"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
@@ -113,28 +113,28 @@
latin:mode="time|datetime"
>
<Key
- latin:keyLabel=":"
+ latin:keySpec=":"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</case>
<default>
<Key
- latin:keyLabel="="
+ latin:keySpec="="
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</default>
</switch>
<Key
- latin:keyLabel="7"
+ latin:keySpec="7"
latin:keyStyle="numKeyStyle"
latin:keyXPos="31%p" />
<Key
- latin:keyLabel="8"
+ latin:keySpec="8"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="9"
+ latin:keySpec="9"
latin:keyStyle="numKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer />
@@ -148,10 +148,10 @@
latin:keyStyle="numStarKeyStyle"
latin:keyXPos="31%p" />
<Key
- latin:keyLabel="0"
+ latin:keySpec="0"
latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="\#"
+ latin:keySpec="\#"
latin:keyStyle="numKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
index c4799bb..9022bc5 100644
--- a/java/res/xml-sw600dp/rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -27,12 +27,12 @@
latin:keyboardLayout="@xml/key_styles_number" />
<Row>
<Key
- latin:keyLabel="-"
+ latin:keySpec="-"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="+"
+ latin:keySpec="+"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
@@ -54,12 +54,12 @@
</Row>
<Row>
<Key
- latin:keyLabel=","
+ latin:keySpec=","
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="."
+ latin:keySpec="."
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
@@ -81,17 +81,17 @@
</Row>
<Row>
<Key
- latin:keyLabel="("
+ latin:keySpec="("
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel=")"
+ latin:keySpec=")"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyLabel="N"
+ latin:keySpec="N"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
@@ -116,7 +116,7 @@
<Key
latin:keyStyle="num0KeyStyle" />
<Key
- latin:keyLabel="\#"
+ latin:keySpec="\#"
latin:keyStyle="numKeyStyle" />
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/rows_symbols.xml b/java/res/xml-sw600dp/rows_symbols.xml
index 7a33f49..a915c33 100644
--- a/java/res/xml-sw600dp/rows_symbols.xml
+++ b/java/res/xml-sw600dp/rows_symbols.xml
@@ -51,9 +51,9 @@
latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="10.0%p" />
<Key
- latin:keyLabel="\\" />
+ latin:keySpec="\\" />
<Key
- latin:keyLabel="=" />
+ latin:keySpec="=" />
<include
latin:keyboardLayout="@xml/rowkeys_symbols3" />
<Key
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index 79d1aa1..7ead4d5 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -54,10 +54,10 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
<Key
- latin:keyLabel="¡" />
+ latin:keySpec="¡" />
<!-- U+00BF: "¿" INVERTED QUESTION MARK -->
<Key
- latin:keyLabel="¿" />
+ latin:keySpec="¿" />
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyWidth="fillRight" />