Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 393efd94 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

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
parent 37b9562f

java/res/xml-sw600dp/key_shortcut.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

java/res/xml-sw600dp/key_styles_common.xml

+6 −6
Original line number Diff line number Diff line
@@ -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>

java/res/xml-sw600dp/key_styles_enter.xml

+6 −6
Original line number Diff line number Diff line
@@ -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"

java/res/xml-sw600dp/keys_comma_period.xml

+6 −6
Original line number Diff line number Diff line
@@ -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>

java/res/xml-sw600dp/keys_exclamation_question.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>