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

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

Reorganize currency keys 

Add Rial(ar), Indian Rupee(hi), Tugrik(mn), Baht(th), Hryvnia(uk),
Dong(vi) currency sign keys to symbol layout.

Bug: 7455289
Change-Id: I0f819631ff05c4a31d3a6868dea5e18a1797f103
parent 249a614a

java/res/xml/key_styles_currency.xml

+47 −48
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
            <include

                latin:keyboardLayout="@xml/key_styles_currency_dollar" />

        </case>

        <!-- Countries using Euro currency, 23 countries as for January 2011. -->

        <!-- Countries using Euro currency, 23 countries as of November 2012.

              1. Andorra (ca_AD, ca_ES)

              2. Austria (de_AT)

              3. Belgium (nl_BE, fr_BE, de_BE)
@@ -40,80 +40,77 @@ 
              9. Greece (el_GR)

             10. Ireland (ga_IE, en_IE)

             11. Italy (it_IT)

             12. Kosovo (??_XK) ??

             12. Kosovo (sq_XK, sr_XK)

             13. Luxembourg (lb_LU, fr_LU, de_LU)

             14. Malta (mt_MT, en_MT)

             15. Monaco (fr_MO)

             16. Montenegro (sla_ME)

             16. Montenegro (??_ME)

             17. Netherlands (nl_NL)

             18. Portugal (pt_PT)

             19. San Marino (it_SM)

             20. Slovakia (sk_SK)

             21. Slovenia (sl_SI)

             22. Spain (es_ES, ca_ES)

             23. Vatican City (it_VA)

        -->

        <!-- Though Denmark, Sweden and Turkey don't use Euro as their currency, having the Euro

             sign on the symbol keyboard might be useful.  Especially Danish krone (kr), Swedish

             krona (kr) and Turkish lira (TL) can be represented by usual alphabet letters. -->

        <!-- Note: Some locales may not have country code, and it it supposed to indicate the

             country where the language originally/mainly spoken. -->

             23. Vatican City (it_VA) -->

        <case

            latin:localeCode="da|de|es|el|fi|fr|it|nl|sk|sl|sv|pt_PT|tr"

            latin:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA"

        >

            <include

                latin:keyboardLayout="@xml/key_styles_currency_euro" />

        </case>

        <!-- Note: Some subtype locale may not have country code, and it it supposed to indicate the

             country where the language originally/mainly spoken. -->

        <!-- Though Denmark, Sweden and Turkey don't use Euro as their currency, having the Euro

             sign on the symbol keyboard might be useful.  Especially Danish krone (kr), Swedish

             krona (kr) and Turkish lira (TL) can be represented by usual alphabet letters. -->

        <!-- TODO: The currency sign of Turkish Lira was created in 2012 and assigned U+20BA for

             its unicode, although there is no font glyph for it as of November 2012. -->

        <!-- da: Denmark (da_DK)

             de: Germany (de_DE)

             es: Spain (es_ES)

             fi: Finland (fi_FI)

             fr: France(fr_FR)

             it: Italy (it_IT)

             nl: Netherlands (nl_NL)

             sk: Slovakia (sk_SK)

             sl: Slovenia (sl_SL)

             sv: Sweden (sv_SV)

             tr: Trukey (tr_TR) -->

        <case

            latin:languageCode="ca|et|lb|mt|sla"

            latin:localeCode="da|de|es|el|fi|fr|it|nl|sk|sl|sv|tr"

        >

            <include

                latin:keyboardLayout="@xml/key_styles_currency_euro" />

        </case>

        <!-- ca: Catalan (Andorra, Spain)

             et: Estonian (Estonia)

             lb: Luxembougish (Luxembourg)

             mt: Maltese (Malta) -->

        <case

            latin:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA"

            latin:languageCode="ca|et|lb|mt"

        >

            <include

                latin:keyboardLayout="@xml/key_styles_currency_euro" />

        </case>

        <!-- fa: Persian (Rial and Afgahni)

             hi: Hindi (Indian Rupee)

             iw: Hebrew (New Sheqel)

             mn: Mongolian (Tugrik)

             th: Thai (Baht)

             uk: Ukrainian (Hryvnia)

             vi: Vietnamese (Dong)  -->

        <!-- TODO: The currency sign of Turkish Lira was created in 2012 and assigned U+20BA for

             its unicode, although there is no font glyph for it as of November 2012. -->

        <case

            latin:languageCode="iw"

            latin:languageCode="fa|hi|iw|mn|th|uk|vi"

        >

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

                 U+00A3: "£" POUND SIGN

                 U+20AC: "€" EURO SIGN

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

            <key-style

                latin:styleName="currencyKeyStyle"

                latin:keyLabel="&#x20AA;"

                latin:moreKeys="!text/more_keys_for_currency_general" />

            <key-style

                latin:styleName="moreCurrency1KeyStyle"

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

            <key-style

                latin:styleName="moreCurrency2KeyStyle"

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

            <key-style

                latin:styleName="moreCurrency3KeyStyle"

                latin:keyLabel="$"

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

            <key-style

                latin:styleName="moreCurrency4KeyStyle"

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

        </case>

        <case

            latin:languageCode="fa"

        >

            <!-- U+FDFC: "﷼" RIAL SIGN

                 U+060B: "؋" AFGHANI SIGN

                 U+00A3: "£" POUND SIGN

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

                 U+20AC: "€" EURO SIGN

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

            <!-- TODO: DroidSansArabic lacks the glyph of U+FCDC: RIAL SIGN -->

            <key-style

                latin:styleName="currencyKeyStyle"

                latin:keyLabel="&#xFDFC;"

                latin:moreKeys="!text/more_keys_for_currency_general,&#x060B;" />

                latin:keyLabel="!text/keylabel_for_currency_generic"

                latin:moreKeys="!text/more_keys_for_currency_generic" />

            <key-style

                latin:styleName="moreCurrency1KeyStyle"

                latin:keyLabel="&#x00A3;" />
@@ -128,18 +125,19 @@ 
                latin:styleName="moreCurrency4KeyStyle"

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

        </case>

        <!-- United Kingdom -->

        <!-- GB: United Kingdom (Pound) -->

        <case

            latin:countryCode="GB"

        >

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

                 U+20AC: "€" EURO SIGN

                 U+00A5: "¥" YEN SIGN

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

                 U+00A2: "¢" CENT SIGN

                 U+20B1: "₱" PESO SIGN -->

            <key-style

                latin:styleName="currencyKeyStyle"

                latin:keyLabel="&#x00A3;"

                latin:moreKeys="!text/more_keys_for_currency_pound" />

                latin:moreKeys="&#x00A2;,$,&#x20AC;,&#x00A5;,&#x20B1;" />

            <key-style

                latin:styleName="moreCurrency1KeyStyle"

                latin:keyLabel="&#x20AC;" />
@@ -154,6 +152,7 @@ 
                latin:styleName="moreCurrency4KeyStyle"

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

        </case>

        <!-- ar: Arabic (Dollar and Rial) -->

        <default>

            <include

                latin:keyboardLayout="@xml/key_styles_currency_dollar" />

java/res/xml/key_styles_currency_euro.xml

+3 −2
Original line number Diff line number Diff line
@@ -20,13 +20,14 @@ 


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

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

         U+00A2: "¢" CENT SIGN

         U+00A3: "£" POUND SIGN

         U+00A5: "¥" YEN SIGN

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

         U+20B1: "₱" PESO SIGN -->

    <key-style

        latin:styleName="currencyKeyStyle"

        latin:keyLabel="&#x20AC;"

        latin:moreKeys="!text/more_keys_for_currency_euro" />

        latin:moreKeys="&#x00A2;,&#x00A3;,$,&#x00A5;,&#x20B1;" />

    <key-style

        latin:styleName="moreCurrency1KeyStyle"

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

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+360 −304

File changed.

Preview size limit exceeded, changes collapsed.

tools/maketext/res/values-ar/donottranslate-more-keys.xml

+7 −0
Original line number Diff line number Diff line
@@ -105,6 +105,13 @@ 
    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

    <!-- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;|&#x00BB;,&#x00BB|&#x00AB;;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string> -->

    <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string>

    <!-- U+00A2: "¢" CENT SIGN

         U+00A3: "£" POUND SIGN

         U+20AC: "€" EURO SIGN

         U+00A5: "¥" YEN SIGN

         U+20B1: "₱" PESO SIGN

         U+FDFC: "﷼" RIAL SIGN -->

    <string name="more_keys_for_currency_dollar">&#x00A2;,&#x00A3;,&#x20AC;,&#x00A5;,&#x20B1;,&#xFDFC;</string>

    <!-- U+0655: "ٕ" ARABIC HAMZA BELOW

         U+0654: "ٔ" ARABIC HAMZA ABOVE

         U+0652: "ْ" ARABIC SUKUN

tools/maketext/res/values-fa/donottranslate-more-keys.xml

+9 −0
Original line number Diff line number Diff line
@@ -112,6 +112,15 @@ 
    <!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK -->

    <!-- <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;|&#x00BB;,&#x00BB|&#x00AB;;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string> -->

    <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!4,&#x201C;,&#x201D;,&#x00AB;|&#x00BB;,&#x00BB;|&#x00AB;,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string>

    <!-- U+FDFC: "﷼" RIAL SIGN

         U+060B: "؋" AFGHANI SIGN

         U+00A2: "¢" CENT SIGN

         U+00A3: "£" POUND SIGN

         U+20AC: "€" EURO SIGN

         U+00A5: "¥" YEN SIGN

         U+20B1: "₱" PESO SIGN -->

    <string name="keylabel_for_currency_generic">&#xFDFC;</string>

    <string name="more_keys_for_currency_generic">$,&#x00A2;,&#x20AC;,&#x00A3;,&#x00A5;,&#x20B1;,&#x060B;</string>

    <!-- U+0655: "ٕ" ARABIC HAMZA BELOW

         U+0652: "ْ" ARABIC SUKUN

         U+0651: "ّ" ARABIC SHADDA