Rename text resources consistently
- keylabel_<key>, the key label text of the <key>
- keyspec_<key>, the key specification of the <key>
- keyhintlabel_<key>, the hint label text of the <key>
- morekeys_<key>, the more keys specifications of the <key>
- additional_morekeys_<key>, the additional more keys specification of
the <key>
Change-Id: Ib2127f21fa33a2568e8a6eba65cfdb2cf78b480e
diff --git a/java/res/xml-sw600dp/key_shortcut.xml b/java/res/xml-sw600dp/key_shortcut.xml
index c869e74..d24e81f 100644
--- a/java/res/xml-sw600dp/key_shortcut.xml
+++ b/java/res/xml-sw600dp/key_shortcut.xml
@@ -29,7 +29,7 @@
<Key
latin:keyStyle="shortcutKeyStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/settings_as_more_key" />
+ latin:moreKeys="!text/keyspec_settings" />
</case>
<case
latin:supportsSwitchingToShortcutIme="true"
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index aa64f85..3d5556f 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -145,23 +145,23 @@
latin:backgroundType="functional" />
<key-style
latin:styleName="toSymbolKeyStyle"
- latin:keySpec="!text/label_to_symbol_key|!code/key_switch_alpha_symbol"
+ latin:keySpec="!text/keylabel_to_symbol|!code/key_switch_alpha_symbol"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="toAlphaKeyStyle"
- latin:keySpec="!text/label_to_alpha_key|!code/key_switch_alpha_symbol"
+ latin:keySpec="!text/keylabel_to_alpha|!code/key_switch_alpha_symbol"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
- latin:keySpec="!text/label_to_more_symbol_for_tablet_key|!code/key_shift"
+ latin:keySpec="!text/keylabel_tablet_to_more_symbol|!code/key_shift"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
- latin:keySpec="!text/label_to_symbol_key|!code/key_shift"
+ latin:keySpec="!text/keylabel_to_symbol|!code/key_shift"
latin:parentStyle="baseForLayoutSwitchKeyStyle" />
<key-style
latin:styleName="comKeyStyle"
- latin:keySpec="!text/keylabel_for_popular_domain"
+ latin:keySpec="!text/keyspec_popular_domain"
latin:keyLabelFlags="autoXScale|fontNormal|hasPopupHint|preserveCase"
- latin:moreKeys="!text/more_keys_for_popular_domain" />
+ latin:moreKeys="!text/morekeys_popular_domain" />
</merge>
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index 05762ad..0699e45 100644
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ b/java/res/xml-sw600dp/key_styles_enter.xml
@@ -21,7 +21,7 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <!-- TODO: Stop using many conditional cases for emoji_key_as_more_key. There are way too many to maintain. -->
+ <!-- TODO: Stop using many conditional cases for keyspec_emoji_key. There are way too many to maintain. -->
<!-- Navigate more keys style -->
<switch>
<!-- latin:passwordInput="true" -->
@@ -32,7 +32,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_previous_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_previous" />
</case>
<case
latin:imeAction="actionNext"
@@ -48,7 +48,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_next_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_next" />
</case>
<case
latin:imeAction="actionPrevious"
@@ -64,7 +64,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" />
+ latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/keyspec_action_previous,!text/keyspec_action_next" />
</case>
<case
latin:navigateNext="true"
@@ -73,7 +73,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_next_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_next" />
</case>
<case
latin:navigateNext="false"
@@ -82,7 +82,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
- latin:moreKeys="!text/action_previous_as_more_key" />
+ latin:moreKeys="!text/keyspec_action_previous" />
</case>
<case
latin:navigateNext="false"
diff --git a/java/res/xml-sw600dp/keys_comma_period.xml b/java/res/xml-sw600dp/keys_comma_period.xml
index eda96b2..ab98733 100644
--- a/java/res/xml-sw600dp/keys_comma_period.xml
+++ b/java/res/xml-sw600dp/keys_comma_period.xml
@@ -22,17 +22,17 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
- latin:keySpec="!text/keylabel_for_tablet_comma"
- latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
+ latin:keySpec="!text/keyspec_tablet_comma"
+ latin:keyHintLabel="!text/keyhintlabel_tablet_comma"
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_tablet_comma"
+ latin:moreKeys="!text/morekeys_tablet_comma"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
- latin:keySpec="!text/keylabel_for_tablet_period"
- latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
+ latin:keySpec="!text/keyspec_tablet_period"
+ latin:keyHintLabel="!text/keyhintlabel_tablet_period"
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_tablet_period"
+ latin:moreKeys="!text/morekeys_tablet_period"
latin:backgroundType="functional"
latin:keyStyle="hasShiftedLetterHintStyle" />
</merge>
diff --git a/java/res/xml-sw600dp/keys_exclamation_question.xml b/java/res/xml-sw600dp/keys_exclamation_question.xml
index 116bef2..97bd95d 100644
--- a/java/res/xml-sw600dp/keys_exclamation_question.xml
+++ b/java/res/xml-sw600dp/keys_exclamation_question.xml
@@ -23,8 +23,8 @@
>
<Key
latin:keySpec="!"
- latin:moreKeys="!text/more_keys_for_exclamation" />
+ latin:moreKeys="!text/morekeys_exclamation" />
<Key
latin:keySpec="\?"
- latin:moreKeys="!text/more_keys_for_question" />
+ latin:moreKeys="!text/morekeys_question" />
</merge>
diff --git a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
index ff1a2c8..9ac718c 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
@@ -40,7 +40,7 @@
latin:keyHintLabel="\?"
latin:additionalMoreKeys="\?"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_question" />
+ latin:moreKeys="!text/morekeys_question" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
@@ -58,7 +58,7 @@
latin:moreKeys="!fixedColumnOrder!3,›,≥,»" />
<Key
latin:keySpec="\?"
- latin:moreKeys="!text/more_keys_for_question" />
+ latin:moreKeys="!text/morekeys_question" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_dvorak3.xml b/java/res/xml-sw600dp/rowkeys_dvorak3.xml
index edc68a3..e58d6db 100644
--- a/java/res/xml-sw600dp/rowkeys_dvorak3.xml
+++ b/java/res/xml-sw600dp/rowkeys_dvorak3.xml
@@ -25,10 +25,10 @@
latin:keySpec="q" />
<Key
latin:keySpec="j"
- latin:moreKeys="!text/more_keys_for_j" />
+ latin:moreKeys="!text/morekeys_j" />
<Key
latin:keySpec="k"
- latin:moreKeys="!text/more_keys_for_k" />
+ latin:moreKeys="!text/morekeys_k" />
<Key
latin:keySpec="x" />
<Key
@@ -37,11 +37,11 @@
latin:keySpec="m" />
<Key
latin:keySpec="w"
- latin:moreKeys="!text/more_keys_for_w" />
+ latin:moreKeys="!text/morekeys_w" />
<Key
latin:keySpec="v"
- latin:moreKeys="!text/more_keys_for_v" />
+ latin:moreKeys="!text/morekeys_v" />
<Key
latin:keySpec="z"
- latin:moreKeys="!text/more_keys_for_z" />
+ latin:moreKeys="!text/morekeys_z" />
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
index 5c7506e..e4b824f 100644
--- a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
+++ b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
@@ -35,61 +35,61 @@
latin:keyHintLabel="!"
latin:additionalMoreKeys="!"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_exclamation,!text/more_keys_for_symbols_1" />
+ latin:moreKeys="!text/morekeys_exclamation,!text/morekeys_symbols_1" />
<Key
latin:keySpec="2"
latin:keyHintLabel="\@"
latin:additionalMoreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_2" />
+ latin:moreKeys="!text/morekeys_symbols_2" />
<Key
latin:keySpec="3"
latin:keyHintLabel="\#"
latin:additionalMoreKeys="\#"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_3" />
+ latin:moreKeys="!text/morekeys_symbols_3" />
<Key
latin:keySpec="4"
latin:keyHintLabel="$"
latin:additionalMoreKeys="$"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_4" />
+ latin:moreKeys="!text/morekeys_symbols_4" />
<Key
latin:keySpec="5"
latin:keyHintLabel="%"
latin:additionalMoreKeys="\\%"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_5" />
+ latin:moreKeys="!text/morekeys_symbols_5" />
<Key
latin:keySpec="6"
latin:keyHintLabel="^"
latin:additionalMoreKeys="^"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_6" />
+ latin:moreKeys="!text/morekeys_symbols_6" />
<Key
latin:keySpec="7"
latin:keyHintLabel="&"
latin:additionalMoreKeys="&"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_7" />
+ latin:moreKeys="!text/morekeys_symbols_7" />
<Key
latin:keySpec="8"
latin:keyHintLabel="*"
latin:additionalMoreKeys="*"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_8" />
+ latin:moreKeys="!text/morekeys_symbols_8" />
<Key
latin:keySpec="9"
latin:keyHintLabel="("
latin:additionalMoreKeys="("
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_9" />
+ latin:moreKeys="!text/morekeys_symbols_9" />
<Key
latin:keySpec="0"
latin:keyHintLabel=")"
latin:additionalMoreKeys=")"
latin:keyStyle="hasShiftedLetterHintStyle"
- latin:moreKeys="!text/more_keys_for_symbols_0" />
+ latin:moreKeys="!text/morekeys_symbols_0" />
<!-- U+2013: "–" EN DASH
U+2014: "—" EM DASH
U+00B7: "·" MIDDLE DOT -->
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
index 15f4cde..757e779 100644
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -69,7 +69,7 @@
<Key
latin:keySpec=","
latin:keyLabelFlags="hasPopupHint"
- latin:moreKeys="!text/more_keys_for_am_pm"
+ latin:moreKeys="!text/morekeys_am_pm"
latin:keyStyle="numKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />