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

1 files changed, 47 insertions, 48 deletions

diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_styles_currency.xml
index 1dadbe033..76fe0e6b0 100644
--- a/java/res/xml/key_styles_currency.xml
+++ b/java/res/xml/key_styles_currency.xml
@@ -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"
-        >
-            <!-- 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"
+            latin:languageCode="fa|hi|iw|mn|th|uk|vi"
         >
-            <!-- 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" />