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

Commit 74097176 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "More readable currency symbol representation"

parents 94a2ac68 41b33149

java/res/xml/key_styles_currency.xml

+18 −10
Original line number Diff line number Diff line
@@ -79,45 +79,53 @@ 
        <case

            latin:languageCode="iw"

        >

            <!-- U+20AA: "₪" NEW SHEQEL SIGN

                 U+00A3: "£" POUND SIGN

                 U+20AC: "€" EURO SIGN

                 U+00A2: "¢" CENT SIGN -->

            <key-style

                latin:styleName="currencyKeyStyle"

                latin:keyLabel="₪"

                latin:keyLabel="&#x20AA;"

                latin:moreKeys="@string/more_keys_for_currency_general" />

            <key-style

                latin:styleName="moreCurrency1KeyStyle"

                latin:keyLabel="£" />

                latin:keyLabel="&#x00A3;" />

            <key-style

                latin:styleName="moreCurrency2KeyStyle"

                latin:keyLabel="€" />

                latin:keyLabel="&#x20AC;" />

            <key-style

                latin:styleName="moreCurrency3KeyStyle"

                latin:keyLabel="$"

                latin:moreKeys="¢" />

                latin:moreKeys="&#x00A2;" />

            <key-style

                latin:styleName="moreCurrency4KeyStyle"

                latin:keyLabel="¢" />

                latin:keyLabel="&#x00A2;" />

        </case>

        <!-- United Kingdom -->

        <case

            latin:countryCode="GB"

        >

            <!-- U+00A3: "£" POUND SIGN

                 U+20AC: "€" EURO SIGN

                 U+00A5: "¥" YEN SIGN

                 U+00A2: "¢" CENT SIGN -->

            <key-style

                latin:styleName="currencyKeyStyle"

                latin:keyLabel="£"

                latin:keyLabel="&#x00A3;"

                latin:moreKeys="@string/more_keys_for_currency_pound" />

            <key-style

                latin:styleName="moreCurrency1KeyStyle"

                latin:keyLabel="€" />

                latin:keyLabel="&#x20AC;" />

            <key-style

                latin:styleName="moreCurrency2KeyStyle"

                latin:keyLabel="¥" />

                latin:keyLabel="&#x00A5;" />

            <key-style

                latin:styleName="moreCurrency3KeyStyle"

                latin:keyLabel="$"

                latin:moreKeys="¢" />

                latin:moreKeys="&#x00A2;" />

            <key-style

                latin:styleName="moreCurrency4KeyStyle"

                latin:keyLabel="¢" />

                latin:keyLabel="&#x00A2;" />

        </case>

        <default>

            <include

java/res/xml/key_styles_currency_dollar.xml

+8 −4
Original line number Diff line number Diff line
@@ -19,20 +19,24 @@ 
-->



<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">

    <!-- U+00A3: "£" POUND SIGN

         U+00A2: "¢" CENT SIGN

         U+20AC: "€" EURO SIGN

         U+00A5: "¥" YEN SIGN -->

    <key-style

        latin:styleName="currencyKeyStyle"

        latin:keyLabel="$"

        latin:moreKeys="@string/more_keys_for_currency_dollar" />

    <key-style

        latin:styleName="moreCurrency1KeyStyle"

        latin:keyLabel="£" />

        latin:keyLabel="&#x00A3;" />

    <key-style

        latin:styleName="moreCurrency2KeyStyle"

        latin:keyLabel="¢" />

        latin:keyLabel="&#x00A2;" />

    <key-style

        latin:styleName="moreCurrency3KeyStyle"

        latin:keyLabel="€" />

        latin:keyLabel="&#x20AC;" />

    <key-style

        latin:styleName="moreCurrency4KeyStyle"

        latin:keyLabel="¥" />

        latin:keyLabel="&#x00A5;" />

</merge>

java/res/xml/key_styles_currency_euro.xml

+9 −5
Original line number Diff line number Diff line
@@ -19,21 +19,25 @@ 
-->



<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">

    <!-- U+20AC: "€" EURO SIGN

         U+00A3: "£" POUND SIGN

         U+00A5: "¥" YEN SIGN

         U+00A2: "¢" CENT SIGN -->

    <key-style

        latin:styleName="currencyKeyStyle"

        latin:keyLabel="€"

        latin:keyLabel="&#x20AC;"

        latin:moreKeys="@string/more_keys_for_currency_euro" />

    <key-style

        latin:styleName="moreCurrency1KeyStyle"

        latin:keyLabel="£" />

        latin:keyLabel="&#x00A3;" />

    <key-style

        latin:styleName="moreCurrency2KeyStyle"

        latin:keyLabel="¥" />

        latin:keyLabel="&#x00A5;" />

    <key-style

        latin:styleName="moreCurrency3KeyStyle"

        latin:keyLabel="$"

        latin:moreKeys="¢" />

        latin:moreKeys="&#x00A2;" />

    <key-style

        latin:styleName="moreCurrency4KeyStyle"

        latin:keyLabel="¢" />

        latin:keyLabel="&#x00A2;" />

</merge>