Currency symbol keys are more aware of locale

* Locale is one of EU, main currency is Euro, and more currencies are
  Pound, Yen and Dollar (plus Cent on 10" tablet)
* Locale is GB, main currency is Pound, and more currencies are
  Euro, Yen and Dollar (plus Cent on 10" tablet)
* Locale has special currency symbol such as Hebrew,
  main currency is the one, and more currencies are
  Pound, Euro, Dollar (plus Cent on 10" tablet)
* Other than these, main currency is Dollar, and more currencies are
  Pound, Cent, Euro (plus Yen on 10" tablet)

Bug: 5281876
Change-Id: I548dc663bafdb3b3f717f4328fda8dfcbafca2df
main
Tadashi G. Takaoka 2011-09-09 15:23:27 +09:00
parent 530b4176c2
commit 9426f7df2a
6 changed files with 133 additions and 30 deletions

View File

@ -23,6 +23,8 @@
> >
<include <include
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<include
latin:keyboardLayout="@xml/kbd_currency_key_styles" />
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="9.0%p"
> >
@ -61,11 +63,11 @@
latin:keyLabel="£" latin:keyLabel="£"
latin:keyXPos="4.5%p" /> latin:keyXPos="4.5%p" />
<Key <Key
latin:keyLabel="¢" /> latin:keyStyle="moreCurrency1KeyStyle" />
<Key <Key
latin:keyLabel="€" /> latin:keyStyle="moreCurrency2KeyStyle" />
<Key <Key
latin:keyLabel="¥" /> latin:keyStyle="moreCurrency3KeyStyle" />
<Key <Key
latin:keyLabel="^" latin:keyLabel="^"
latin:moreKeys="↑,↓,←,→" /> latin:moreKeys="↑,↓,←,→" />

View File

@ -23,6 +23,8 @@
> >
<include <include
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<include
latin:keyboardLayout="@xml/kbd_currency_key_styles" />
<Row <Row
latin:keyWidth="8.282%p" latin:keyWidth="8.282%p"
> >
@ -66,13 +68,13 @@
latin:keyLabelOption="alignLeft" latin:keyLabelOption="alignLeft"
latin:keyWidth="11.172%p" /> latin:keyWidth="11.172%p" />
<Key <Key
latin:keyLabel="£" /> latin:keyStyle="moreCurrency1KeyStyle" />
<Key <Key
latin:keyLabel="¢" /> latin:keyStyle="moreCurrency2KeyStyle" />
<Key <Key
latin:keyLabel="€" /> latin:keyStyle="moreCurrency3KeyStyle" />
<Key <Key
latin:keyLabel="¥" /> latin:keyStyle="moreCurrency4KeyStyle" />
<Key <Key
latin:keyLabel="^" latin:keyLabel="^"
latin:moreKeys="↑,↓,←,→" /> latin:moreKeys="↑,↓,←,→" />

View File

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="$"
latin:moreKeys="@string/more_keys_for_currency_dollar" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="£" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="¢" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="€" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="¥" />
</merge>

View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2011, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="€"
latin:moreKeys="@string/more_keys_for_currency_euro" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="£" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="¥" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="$"
latin:moreKeys="¢" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="¢" />
</merge>

View File

@ -25,9 +25,8 @@
<case <case
latin:passwordInput="true" latin:passwordInput="true"
> >
<key-style <include
latin:styleName="currencyKeyStyle" latin:keyboardLayout="@xml/kbd_currency_dollar_key_styles" />
latin:keyLabel="$" />
</case> </case>
<!-- Countries using Euro currency, 23 countries as for January 2011. --> <!-- Countries using Euro currency, 23 countries as for January 2011. -->
1. Andorra (ca_AD, ca_ES) 1. Andorra (ca_AD, ca_ES)
@ -54,31 +53,28 @@
22. Spain (es_ES, ca_ES) 22. Spain (es_ES, ca_ES)
23. Vatican City (it_VA) 23. Vatican City (it_VA)
--> -->
<!-- Though Denmark and Turkey don't using Euro as their currencies, but having Euro sign on
the symbol keyboard might be useful. Especially Danish krone (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 <!-- Note: Some locales may not have country code, and it it supposed to indicate the
country where the language originally/mainly spoken. --> country where the language originally/mainly spoken. -->
<case <case
latin:localeCode="de|es|el|fi|fr|it|nl|sk|sl|pt_PT" latin:localeCode="da|de|es|el|fi|fr|it|nl|sk|sl|pt_PT|tr"
> >
<key-style <include
latin:styleName="currencyKeyStyle" latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
latin:keyLabel="€"
latin:moreKeys="@string/more_keys_for_currency_euro" />
</case> </case>
<case <case
latin:languageCode="ca|et|lb|mt|sla" latin:languageCode="ca|et|lb|mt|sla"
> >
<key-style <include
latin:styleName="currencyKeyStyle" latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
latin:keyLabel="€"
latin:moreKeys="@string/more_keys_for_currency_euro" />
</case> </case>
<case <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:countryCode="AD|AT|BE|CY|EE|FI|FR|DE|GR|IE|IT|XK|LU|MT|MO|ME|NL|PT|SM|SK|SI|ES|VA"
> >
<key-style <include
latin:styleName="currencyKeyStyle" latin:keyboardLayout="@xml/kbd_currency_euro_key_styles" />
latin:keyLabel="€"
latin:moreKeys="@string/more_keys_for_currency_euro" />
</case> </case>
<case <case
latin:languageCode="iw" latin:languageCode="iw"
@ -87,6 +83,19 @@
latin:styleName="currencyKeyStyle" latin:styleName="currencyKeyStyle"
latin:keyLabel="₪" latin:keyLabel="₪"
latin:moreKeys="@string/more_keys_for_currency_general" /> latin:moreKeys="@string/more_keys_for_currency_general" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="£" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="€" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="$"
latin:moreKeys="¢" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="¢" />
</case> </case>
<!-- United Kingdom --> <!-- United Kingdom -->
<case <case
@ -96,12 +105,23 @@
latin:styleName="currencyKeyStyle" latin:styleName="currencyKeyStyle"
latin:keyLabel="£" latin:keyLabel="£"
latin:moreKeys="@string/more_keys_for_currency_pound" /> latin:moreKeys="@string/more_keys_for_currency_pound" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
latin:keyLabel="€" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
latin:keyLabel="¥" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="$"
latin:moreKeys="¢" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
latin:keyLabel="¢" />
</case> </case>
<default> <default>
<key-style <include
latin:styleName="currencyKeyStyle" latin:keyboardLayout="@xml/kbd_currency_dollar_key_styles" />
latin:keyLabel="$"
latin:moreKeys="@string/more_keys_for_currency_dollar" />
</default> </default>
</switch> </switch>
</merge> </merge>

View File

@ -23,6 +23,8 @@
> >
<include <include
latin:keyboardLayout="@xml/kbd_key_styles" /> latin:keyboardLayout="@xml/kbd_key_styles" />
<include
latin:keyboardLayout="@xml/kbd_currency_key_styles" />
<Row <Row
latin:keyWidth="10%p" latin:keyWidth="10%p"
> >
@ -56,11 +58,11 @@
<Key <Key
latin:keyStyle="nonSpecialBackgroundTabKeyStyle" /> latin:keyStyle="nonSpecialBackgroundTabKeyStyle" />
<Key <Key
latin:keyLabel="£" /> latin:keyStyle="moreCurrency1KeyStyle" />
<Key <Key
latin:keyLabel="¢" /> latin:keyStyle="moreCurrency2KeyStyle" />
<Key <Key
latin:keyLabel="€" /> latin:keyStyle="moreCurrency3KeyStyle" />
<Key <Key
latin:keyLabel="°" latin:keyLabel="°"
latin:moreKeys=",″" /> latin:moreKeys=",″" />