Skip to content
Snippets Groups Projects
Commit 6bfd5f63 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Fix confusable "label" usage, use "text" instead

* Rename makelabel tool to maketext
* Rename KeyboardLablesSet class to KeyboardTextsSet
* Rename "!label/name" to "!text/name"

Change-Id: Ia9494a89fe56f20ca8e8fedb253adbcf8b771bd3
parent cf41aff2
No related branches found
No related tags found
No related merge requests found
Showing
with 81 additions and 81 deletions
......@@ -29,7 +29,7 @@
<Key
latin:keyStyle="shortcutKeyStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!label/settings_as_more_key"
latin:moreKeys="!text/settings_as_more_key"
latin:keyWidth="fillBoth" />
</case>
<case
......
......@@ -92,7 +92,7 @@
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!label/more_keys_for_smiley" />
latin:moreKeys="!text/more_keys_for_smiley" />
<key-style
latin:styleName="shortcutKeyStyle"
latin:code="!code/key_shortcut"
......@@ -130,32 +130,32 @@
<key-style
latin:styleName="toSymbolKeyStyle"
latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="!label/label_to_symbol_key"
latin:keyLabel="!text/label_to_symbol_key"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toAlphaKeyStyle"
latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="!label/label_to_alpha_key"
latin:keyLabel="!text/label_to_alpha_key"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
latin:code="!code/key_shift"
latin:keyLabel="!label/label_to_more_symbol_for_tablet_key"
latin:keyLabel="!text/label_to_more_symbol_for_tablet_key"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
latin:code="!code/key_shift"
latin:keyLabel="!label/label_to_symbol_key"
latin:keyLabel="!text/label_to_symbol_key"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="comKeyStyle"
latin:keyLabel="!label/keylabel_for_popular_domain"
latin:keyLabel="!text/keylabel_for_popular_domain"
latin:keyLabelFlags="fontNormal|hasPopupHint|preserveCase"
latin:keyOutputText="!label/keylabel_for_popular_domain"
latin:moreKeys="!label/more_keys_for_popular_domain" />
latin:keyOutputText="!text/keylabel_for_popular_domain"
latin:moreKeys="!text/more_keys_for_popular_domain" />
</merge>
......@@ -39,9 +39,9 @@
</case>
<default>
<Key
latin:keyLabel="!label/keylabel_for_apostrophe"
latin:keyHintLabel="!label/keyhintlabel_for_apostrophe"
latin:moreKeys="!label/more_keys_for_apostrophe"
latin:keyLabel="!text/keylabel_for_apostrophe"
latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
latin:moreKeys="!text/more_keys_for_apostrophe"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
......@@ -54,9 +54,9 @@
</case>
<default>
<Key
latin:keyLabel="!label/keylabel_for_dash"
latin:keyHintLabel="!label/keyhintlabel_for_dash"
latin:moreKeys="!label/more_keys_for_dash"
latin:keyLabel="!text/keylabel_for_dash"
latin:keyHintLabel="!text/keyhintlabel_for_dash"
latin:moreKeys="!text/more_keys_for_dash"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
......
......@@ -32,14 +32,14 @@
</case>
<default>
<Key
latin:keyLabel="!label/keylabel_for_tablet_comma"
latin:keyHintLabel="!label/keyhintlabel_for_tablet_comma"
latin:moreKeys="!label/more_keys_for_tablet_comma"
latin:keyLabel="!text/keylabel_for_tablet_comma"
latin:keyHintLabel="!text/keyhintlabel_for_tablet_comma"
latin:moreKeys="!text/more_keys_for_tablet_comma"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="."
latin:keyHintLabel="!label/keyhintlabel_for_tablet_period"
latin:moreKeys="!label/more_keys_for_tablet_period"
latin:keyHintLabel="!text/keyhintlabel_for_tablet_period"
latin:moreKeys="!text/more_keys_for_tablet_period"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
......
......@@ -26,13 +26,13 @@
<Key
latin:keyStyle="currencyKeyStyle" />
<Key
latin:keyLabel="!label/keylabel_for_symbols_percent"
latin:moreKeys="!label/more_keys_for_symbols_percent" />
latin:keyLabel="!text/keylabel_for_symbols_percent"
latin:moreKeys="!text/more_keys_for_symbols_percent" />
<Key
latin:keyLabel="&amp;" />
<Key
latin:keyLabel="*"
latin:moreKeys="!label/more_keys_for_star" />
latin:moreKeys="!text/more_keys_for_star" />
<!-- U+2013: "–" EN DASH
U+2014: "—" EM DASH -->
<Key
......@@ -40,7 +40,7 @@
latin:moreKeys="_,&#x2013;,&#x2014;" />
<Key
latin:keyLabel="+"
latin:moreKeys="!label/more_keys_for_plus" />
latin:moreKeys="!text/more_keys_for_plus" />
<include
latin:keyboardLayout="@xml/keys_parentheses" />
</merge>
......@@ -41,11 +41,11 @@
</default>
</switch>
<Key
latin:keyLabel="!label/keylabel_for_symbols_semicolon"
latin:moreKeys="!label/more_keys_for_symbols_semicolon" />
latin:keyLabel="!text/keylabel_for_symbols_semicolon"
latin:moreKeys="!text/more_keys_for_symbols_semicolon" />
<Key
latin:keyLabel="!label/keylabel_for_comma"
latin:moreKeys="!label/more_keys_for_comma" />
latin:keyLabel="!text/keylabel_for_comma"
latin:moreKeys="!text/more_keys_for_comma" />
<Key
latin:keyLabel="." />
<!-- U+00A1: "¡" INVERTED EXCLAMATION MARK -->
......@@ -53,6 +53,6 @@
latin:keyLabel="!"
latin:moreKeys="&#x00A1;" />
<Key
latin:keyLabel="!label/keylabel_for_symbols_question"
latin:moreKeys="!label/more_keys_for_symbols_question" />
latin:keyLabel="!text/keylabel_for_symbols_question"
latin:moreKeys="!text/more_keys_for_symbols_question" />
</merge>
......@@ -30,7 +30,7 @@
<!-- U+2022: "•" BULLET -->
<Key
latin:keyLabel="&#x2022;"
latin:moreKeys="!label/more_keys_for_bullet" />
latin:moreKeys="!text/more_keys_for_bullet" />
<!-- U+221A: "√" SQUARE ROOT -->
<Key
latin:keyLabel="&#x221A;" />
......
......@@ -70,7 +70,7 @@
<Key
latin:keyLabel=","
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!label/more_keys_for_am_pm"
latin:moreKeys="!text/more_keys_for_am_pm"
latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
</case>
......
......@@ -37,7 +37,7 @@
latin:keyWidth="39.750%p" />
<Key
latin:keyLabel="&quot;"
latin:moreKeys="!label/more_keys_for_tablet_double_quote" />
latin:moreKeys="!text/more_keys_for_tablet_double_quote" />
<Key
latin:keyLabel="_" />
<Spacer
......
......@@ -91,7 +91,7 @@
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!label/more_keys_for_smiley" />
latin:moreKeys="!text/more_keys_for_smiley" />
<key-style
latin:styleName="shortcutKeyStyle"
latin:code="!code/key_shortcut"
......@@ -113,7 +113,7 @@
<key-style
latin:styleName="tabKeyStyle"
latin:code="!code/key_action_previous"
latin:keyLabel="!label/label_tab_key"
latin:keyLabel="!text/label_tab_key"
latin:keyLabelFlags="fontNormal|preserveCase"
latin:backgroundType="functional" />
</case>
......@@ -121,7 +121,7 @@
<key-style
latin:styleName="tabKeyStyle"
latin:code="!code/key_tab"
latin:keyLabel="!label/label_tab_key"
latin:keyLabel="!text/label_tab_key"
latin:keyLabelFlags="fontNormal|preserveCase"
latin:backgroundType="functional" />
</default>
......@@ -129,35 +129,35 @@
<key-style
latin:styleName="toSymbolKeyStyle"
latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="!label/label_to_symbol_key"
latin:keyLabel="!text/label_to_symbol_key"
latin:keyLabelFlags="fontNormal"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toAlphaKeyStyle"
latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="!label/label_to_alpha_key"
latin:keyLabel="!text/label_to_alpha_key"
latin:keyLabelFlags="fontNormal|preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
latin:code="!code/key_shift"
latin:keyLabel="!label/label_to_more_symbol_for_tablet_key"
latin:keyLabel="!text/label_to_more_symbol_for_tablet_key"
latin:keyLabelFlags="fontNormal"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
latin:code="!code/key_shift"
latin:keyLabel="!label/label_to_symbol_key"
latin:keyLabel="!text/label_to_symbol_key"
latin:keyLabelFlags="fontNormal"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="comKeyStyle"
latin:keyLabel="!label/keylabel_for_popular_domain"
latin:keyLabel="!text/keylabel_for_popular_domain"
latin:keyLabelFlags="fontNormal|hasPopupHint|preserveCase"
latin:keyOutputText="!label/keylabel_for_popular_domain"
latin:moreKeys="!label/more_keys_for_popular_domain" />
latin:keyOutputText="!text/keylabel_for_popular_domain"
latin:moreKeys="!text/more_keys_for_popular_domain" />
</merge>
......@@ -39,9 +39,9 @@
</case>
<default>
<Key
latin:keyLabel="!label/keylabel_for_apostrophe"
latin:keyHintLabel="!label/keyhintlabel_for_apostrophe"
latin:moreKeys="!label/more_keys_for_apostrophe"
latin:keyLabel="!text/keylabel_for_apostrophe"
latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
latin:moreKeys="!text/more_keys_for_apostrophe"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
......@@ -54,9 +54,9 @@
</case>
<default>
<Key
latin:keyLabel="!label/keylabel_for_dash"
latin:keyHintLabel="!label/keyhintlabel_for_dash"
latin:moreKeys="!label/more_keys_for_dash"
latin:keyLabel="!text/keylabel_for_dash"
latin:keyHintLabel="!text/keyhintlabel_for_dash"
latin:moreKeys="!text/more_keys_for_dash"
latin:keyStyle="hasShiftedLetterHintStyle" />
</default>
</switch>
......
......@@ -72,7 +72,7 @@
<Key
latin:keyLabel=","
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!label/more_keys_for_am_pm"
latin:moreKeys="!text/more_keys_for_am_pm"
latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
</case>
......
......@@ -37,7 +37,7 @@
latin:keyWidth="37.500%p" />
<Key
latin:keyLabel="&quot;"
latin:moreKeys="!label/more_keys_for_tablet_double_quote" />
latin:moreKeys="!text/more_keys_for_tablet_double_quote" />
<Key
latin:keyLabel="_" />
<switch>
......
......@@ -31,7 +31,7 @@
<default>
<Key
latin:keyLabel="\'"
latin:moreKeys="!label/more_keys_for_single_quote" />
latin:moreKeys="!text/more_keys_for_single_quote" />
</default>
</switch>
</merge>
......@@ -35,7 +35,7 @@
<key-style
latin:styleName="f1MoreKeysStyle"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!label/settings_as_more_key"
latin:moreKeys="!text/settings_as_more_key"
latin:backgroundType="functional" />
</default>
</switch>
......@@ -98,7 +98,7 @@
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!label/more_keys_for_smiley"
latin:moreKeys="!text/more_keys_for_smiley"
latin:backgroundType="functional" />
</case>
</switch>
......@@ -157,7 +157,7 @@
latin:styleName="toSymbolKeyStyle"
latin:code="!code/key_switch_alpha_symbol"
latin:keyIcon="!icon/shortcut_for_label"
latin:keyLabel="!label/label_to_symbol_with_microphone_key"
latin:keyLabel="!text/label_to_symbol_with_microphone_key"
latin:keyLabelFlags="withIconRight"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
......@@ -166,7 +166,7 @@
<key-style
latin:styleName="toSymbolKeyStyle"
latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="!label/label_to_symbol_key"
latin:keyLabel="!text/label_to_symbol_key"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</default>
......@@ -174,27 +174,27 @@
<key-style
latin:styleName="toAlphaKeyStyle"
latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="!label/label_to_alpha_key"
latin:keyLabel="!text/label_to_alpha_key"
latin:keyLabelFlags="preserveCase"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
latin:code="!code/key_shift"
latin:keyLabel="!label/label_to_more_symbol_key"
latin:keyLabel="!text/label_to_more_symbol_key"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
latin:code="!code/key_shift"
latin:keyLabel="!label/label_to_symbol_key"
latin:keyLabel="!text/label_to_symbol_key"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<key-style
latin:styleName="punctuationKeyStyle"
latin:keyLabel="."
latin:keyHintLabel="!label/keyhintlabel_for_punctuation"
latin:keyHintLabel="!text/keyhintlabel_for_punctuation"
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!label/more_keys_for_punctuation"
latin:moreKeys="!text/more_keys_for_punctuation"
latin:backgroundType="functional" />
</merge>
......@@ -86,7 +86,7 @@
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="&#x20AA;"
latin:moreKeys="!label/more_keys_for_currency_general" />
latin:moreKeys="!text/more_keys_for_currency_general" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="&#x00A3;" />
......@@ -112,7 +112,7 @@
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="&#xFDFC;"
latin:moreKeys="!label/more_keys_for_currency_general" />
latin:moreKeys="!text/more_keys_for_currency_general" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="£" />
......@@ -138,7 +138,7 @@
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="&#x00A3;"
latin:moreKeys="!label/more_keys_for_currency_pound" />
latin:moreKeys="!text/more_keys_for_currency_pound" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="&#x20AC;" />
......
......@@ -26,7 +26,7 @@
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="$"
latin:moreKeys="!label/more_keys_for_currency_dollar" />
latin:moreKeys="!text/more_keys_for_currency_dollar" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="&#x00A3;" />
......
......@@ -30,7 +30,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!label/action_previous_as_more_key" />
latin:moreKeys="!text/action_previous_as_more_key" />
</case>
<case
latin:imeAction="actionNext"
......@@ -46,7 +46,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!label/action_next_as_more_key" />
latin:moreKeys="!text/action_next_as_more_key" />
</case>
<case
latin:imeAction="actionPrevious"
......@@ -63,7 +63,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!label/action_previous_as_more_key,!label/action_next_as_more_key" />
latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" />
</case>
<case
latin:navigateNext="true"
......@@ -72,7 +72,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!label/action_next_as_more_key" />
latin:moreKeys="!text/action_next_as_more_key" />
</case>
<case
latin:navigateNext="false"
......@@ -81,7 +81,7 @@
<key-style
latin:styleName="navigateMoreKeysStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!label/action_previous_as_more_key" />
latin:moreKeys="!text/action_previous_as_more_key" />
</case>
<!-- naviagteNext="false" and navigatePrevious="false" -->
<default>
......@@ -119,7 +119,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
latin:keyLabel="!label/label_go_key"
latin:keyLabel="!text/label_go_key"
latin:parentStyle="defaultActionKeyStyle" />
</case>
<case
......@@ -127,7 +127,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
latin:keyLabel="!label/label_next_key"
latin:keyLabel="!text/label_next_key"
latin:parentStyle="defaultActionKeyStyle" />
</case>
<case
......@@ -135,7 +135,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
latin:keyLabel="!label/label_previous_key"
latin:keyLabel="!text/label_previous_key"
latin:parentStyle="defaultActionKeyStyle" />
</case>
<case
......@@ -143,7 +143,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
latin:keyLabel="!label/label_done_key"
latin:keyLabel="!text/label_done_key"
latin:parentStyle="defaultActionKeyStyle" />
</case>
<case
......@@ -151,7 +151,7 @@
>
<key-style
latin:styleName="enterKeyStyle"
latin:keyLabel="!label/label_send_key"
latin:keyLabel="!text/label_send_key"
latin:parentStyle="defaultActionKeyStyle" />
</case>
<case
......
......@@ -100,25 +100,25 @@
<key-style
latin:styleName="numPhoneToSymbolKeyStyle"
latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="!label/label_to_phone_symbols_key"
latin:keyLabel="!text/label_to_phone_symbols_key"
latin:parentStyle="numModeKeyStyle" />
<key-style
latin:styleName="numPhoneToNumericKeyStyle"
latin:code="!code/key_switch_alpha_symbol"
latin:keyLabel="!label/label_to_phone_numeric_key"
latin:keyLabel="!text/label_to_phone_numeric_key"
latin:parentStyle="numModeKeyStyle" />
<!-- U+002C: "," COMMA -->
<key-style
latin:styleName="numPauseKeyStyle"
latin:code="0x002C"
latin:keyLabel="!label/label_pause_key"
latin:keyLabel="!text/label_pause_key"
latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"
latin:parentStyle="numKeyBaseStyle" />
<!-- U+003B: ";" SEMICOLON -->
<key-style
latin:styleName="numWaitKeyStyle"
latin:code="0x003B"
latin:keyLabel="!label/label_wait_key"
latin:keyLabel="!text/label_wait_key"
latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"
latin:parentStyle="numKeyBaseStyle" />
<key-style
......
......@@ -24,9 +24,9 @@
<Key
latin:keyLabel="&lt;"
latin:code="!code/key_less_than"
latin:moreKeys="!label/more_keys_for_less_than" />
latin:moreKeys="!text/more_keys_for_less_than" />
<Key
latin:keyLabel="&gt;"
latin:code="!code/key_greater_than"
latin:moreKeys="!label/more_keys_for_greater_than" />
latin:moreKeys="!text/more_keys_for_greater_than" />
</merge>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment