Merge "More readable currency symbol representation"

main
Tadashi G. Takaoka 2012-03-26 04:20:17 -07:00 committed by Android (Google) Code Review
commit 7409717648
3 changed files with 35 additions and 19 deletions

View File

@ -79,45 +79,53 @@
<case <case
latin:languageCode="iw" latin:languageCode="iw"
> >
<!-- U+20AA: "₪" NEW SHEQEL SIGN
U+00A3: "£" POUND SIGN
U+20AC: "€" EURO SIGN
U+00A2: "¢" CENT SIGN -->
<key-style <key-style
latin:styleName="currencyKeyStyle" latin:styleName="currencyKeyStyle"
latin:keyLabel="₪" latin:keyLabel="&#x20AA;"
latin:moreKeys="@string/more_keys_for_currency_general" /> latin:moreKeys="@string/more_keys_for_currency_general" />
<key-style <key-style
latin:styleName="moreCurrency1KeyStyle" latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="£" /> latin:keyLabel="&#x00A3;" />
<key-style <key-style
latin:styleName="moreCurrency2KeyStyle" latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="" /> latin:keyLabel="&#x20AC;" />
<key-style <key-style
latin:styleName="moreCurrency3KeyStyle" latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="$" latin:keyLabel="$"
latin:moreKeys="¢" /> latin:moreKeys="&#x00A2;" />
<key-style <key-style
latin:styleName="moreCurrency4KeyStyle" latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="¢" /> latin:keyLabel="&#x00A2;" />
</case> </case>
<!-- United Kingdom --> <!-- United Kingdom -->
<case <case
latin:countryCode="GB" latin:countryCode="GB"
> >
<!-- U+00A3: "£" POUND SIGN
U+20AC: "€" EURO SIGN
U+00A5: "¥" YEN SIGN
U+00A2: "¢" CENT SIGN -->
<key-style <key-style
latin:styleName="currencyKeyStyle" latin:styleName="currencyKeyStyle"
latin:keyLabel="£" latin:keyLabel="&#x00A3;"
latin:moreKeys="@string/more_keys_for_currency_pound" /> latin:moreKeys="@string/more_keys_for_currency_pound" />
<key-style <key-style
latin:styleName="moreCurrency1KeyStyle" latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="" /> latin:keyLabel="&#x20AC;" />
<key-style <key-style
latin:styleName="moreCurrency2KeyStyle" latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="¥" /> latin:keyLabel="&#x00A5;" />
<key-style <key-style
latin:styleName="moreCurrency3KeyStyle" latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="$" latin:keyLabel="$"
latin:moreKeys="¢" /> latin:moreKeys="&#x00A2;" />
<key-style <key-style
latin:styleName="moreCurrency4KeyStyle" latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="¢" /> latin:keyLabel="&#x00A2;" />
</case> </case>
<default> <default>
<include <include

View File

@ -19,20 +19,24 @@
--> -->
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <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 <key-style
latin:styleName="currencyKeyStyle" latin:styleName="currencyKeyStyle"
latin:keyLabel="$" latin:keyLabel="$"
latin:moreKeys="@string/more_keys_for_currency_dollar" /> latin:moreKeys="@string/more_keys_for_currency_dollar" />
<key-style <key-style
latin:styleName="moreCurrency1KeyStyle" latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="£" /> latin:keyLabel="&#x00A3;" />
<key-style <key-style
latin:styleName="moreCurrency2KeyStyle" latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="¢" /> latin:keyLabel="&#x00A2;" />
<key-style <key-style
latin:styleName="moreCurrency3KeyStyle" latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="" /> latin:keyLabel="&#x20AC;" />
<key-style <key-style
latin:styleName="moreCurrency4KeyStyle" latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="¥" /> latin:keyLabel="&#x00A5;" />
</merge> </merge>

View File

@ -19,21 +19,25 @@
--> -->
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <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 <key-style
latin:styleName="currencyKeyStyle" latin:styleName="currencyKeyStyle"
latin:keyLabel="€" latin:keyLabel="&#x20AC;"
latin:moreKeys="@string/more_keys_for_currency_euro" /> latin:moreKeys="@string/more_keys_for_currency_euro" />
<key-style <key-style
latin:styleName="moreCurrency1KeyStyle" latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="£" /> latin:keyLabel="&#x00A3;" />
<key-style <key-style
latin:styleName="moreCurrency2KeyStyle" latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="¥" /> latin:keyLabel="&#x00A5;" />
<key-style <key-style
latin:styleName="moreCurrency3KeyStyle" latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="$" latin:keyLabel="$"
latin:moreKeys="¢" /> latin:moreKeys="&#x00A2;" />
<key-style <key-style
latin:styleName="moreCurrency4KeyStyle" latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="¢" /> latin:keyLabel="&#x00A2;" />
</merge> </merge>