diff options
Diffstat (limited to 'java/res')
-rw-r--r-- | java/res/values/donottranslate-altchars.xml | 3 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_number.xml | 14 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_phone.xml | 14 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_phone_symbols.xml | 14 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_qwerty_row4.xml | 12 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_symbols.xml | 17 | ||||
-rw-r--r-- | java/res/xml-xlarge/kbd_symbols_shift.xml | 12 | ||||
-rw-r--r-- | java/res/xml/kbd_currency_key_styles.xml | 269 | ||||
-rw-r--r-- | java/res/xml/kbd_symbols.xml | 5 |
9 files changed, 341 insertions, 19 deletions
diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml index 4b1a6ae6d..518e74af1 100644 --- a/java/res/values/donottranslate-altchars.xml +++ b/java/res/values/donottranslate-altchars.xml @@ -44,6 +44,9 @@ <string name="alternates_for_scandinavia_row2_11"></string> <string name="alternates_for_cyrillic_e"></string> <string name="alternates_for_cyrillic_soft_sign"></string> + <string name="alternates_for_currency_dollar">¢,£,€,¥,₱</string> + <string name="alternates_for_currency_euro">¢,£,$,¥,₱</string> + <string name="alternates_for_currency_pound">¢,$,€,¥,₱</string> <string name="alternates_for_mic">"\@drawable/sym_keyboard_settings|\@integer/key_settings,\@drawable/sym_keyboard_mic|\@integer/key_voice"</string> <string name="alternates_for_smiley">":-)|:-) ,:-(|:-( ,;-)|;-) ,:-P|:-P ,=-O|=-O ,:-*|:-* ,:O|:O ,B-)|B-) ,:-$|:-$ ,:-!|:-! ,:-[|:-[ ,O:-)|O:-) ,:-\\\\\\\\|:-\\\\\\\\ ,:\'(|:\'( ,:-D|:-D "</string> <string name="alternates_for_settings_slash">"\@drawable/sym_keyboard_settings|\@integer/key_settings,/"</string> diff --git a/java/res/xml-xlarge/kbd_number.xml b/java/res/xml-xlarge/kbd_number.xml index 152ec8285..ce3277b5d 100644 --- a/java/res/xml-xlarge/kbd_number.xml +++ b/java/res/xml-xlarge/kbd_number.xml @@ -187,9 +187,17 @@ left edge key. --> <Spacer latin:horizontalGap="8.362%p" /> - <Key - latin:keyStyle="settingsKeyStyle" - latin:keyWidth="8.042%p" /> + <switch> + <case latin:hasSettingsKey="true"> + <Key + latin:keyStyle="settingsKeyStyle" + latin:keyWidth="8.042%p" /> + </case> + <default> + <Spacer + latin:horizontalGap="8.042%p" /> + </default> + </switch> <Key latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyWidth="24.127%p" /> diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml index b9444ad50..9122176a9 100644 --- a/java/res/xml-xlarge/kbd_phone.xml +++ b/java/res/xml-xlarge/kbd_phone.xml @@ -129,9 +129,17 @@ the touch event on the area, "space" is intentionally not marked as a left edge key. --> <Spacer latin:horizontalGap="12.340%p" /> - <Key - latin:keyStyle="settingsKeyStyle" - latin:keyWidth="8.042%p" /> + <switch> + <case latin:hasSettingsKey="true"> + <Key + latin:keyStyle="settingsKeyStyle" + latin:keyWidth="8.042%p" /> + </case> + <default> + <Spacer + latin:horizontalGap="8.042%p" /> + </default> + </switch> <Key latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyWidth="16.084%p" /> diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml index 690bcde0c..055c14867 100644 --- a/java/res/xml-xlarge/kbd_phone_symbols.xml +++ b/java/res/xml-xlarge/kbd_phone_symbols.xml @@ -141,9 +141,17 @@ the touch event on the area, "space" is intentionally not marked as a left edge key. --> <Spacer latin:horizontalGap="8.362%p" /> - <Key - latin:keyStyle="settingsKeyStyle" - latin:keyWidth="8.042%p" /> + <switch> + <case latin:hasSettingsKey="true"> + <Key + latin:keyStyle="settingsKeyStyle" + latin:keyWidth="8.042%p" /> + </case> + <default> + <Spacer + latin:horizontalGap="8.042%p" /> + </default> + </switch> <Key latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle" latin:keyWidth="24.127%p" /> diff --git a/java/res/xml-xlarge/kbd_qwerty_row4.xml b/java/res/xml-xlarge/kbd_qwerty_row4.xml index 8011064a4..f36b61fc7 100644 --- a/java/res/xml-xlarge/kbd_qwerty_row4.xml +++ b/java/res/xml-xlarge/kbd_qwerty_row4.xml @@ -27,8 +27,16 @@ > <Spacer latin:horizontalGap="8.362%p" /> - <Key - latin:keyStyle="settingsKeyStyle" /> + <switch> + <case latin:hasSettingsKey="true"> + <Key + latin:keyStyle="settingsKeyStyle" /> + </case> + <default> + <Spacer + latin:horizontalGap="8.042%p" /> + </default> + </switch> <switch> <case latin:languageCode="ru" diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml index 640dd0904..f81cea7fb 100644 --- a/java/res/xml-xlarge/kbd_symbols.xml +++ b/java/res/xml-xlarge/kbd_symbols.xml @@ -30,6 +30,8 @@ > <include latin:keyboardLayout="@xml/kbd_key_styles" /> + <include + latin:keyboardLayout="@xml/kbd_currency_key_styles" /> <!-- This row is intentionally not marked as a top row --> <Row latin:keyWidth="8.272%p" @@ -82,8 +84,7 @@ <Key latin:keyLabel="#" /> <Key - latin:keyLabel="$" - latin:popupCharacters="¢,£,€,¥,₣,₤,₱" /> + latin:keyStyle="currencyKeyStyle" /> <Key latin:keyLabel="%" latin:popupCharacters="‰" /> @@ -167,8 +168,16 @@ > <Spacer latin:horizontalGap="8.362%p" /> - <Key - latin:keyStyle="settingsKeyStyle" /> + <switch> + <case latin:hasSettingsKey="true"> + <Key + latin:keyStyle="settingsKeyStyle" /> + </case> + <default> + <Spacer + latin:horizontalGap="8.042%p" /> + </default> + </switch> <Key latin:keyLabel="/" /> <Key diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml index 1f5513b83..8359b7571 100644 --- a/java/res/xml-xlarge/kbd_symbols_shift.xml +++ b/java/res/xml-xlarge/kbd_symbols_shift.xml @@ -155,8 +155,16 @@ > <Spacer latin:horizontalGap="24.446%p" /> - <Key - latin:keyStyle="settingsKeyStyle" /> + <switch> + <case latin:hasSettingsKey="true"> + <Key + latin:keyStyle="settingsKeyStyle" /> + </case> + <default> + <Spacer + latin:horizontalGap="8.042%p" /> + </default> + </switch> <Key latin:keyStyle="spaceKeyStyle" latin:keyWidth="37.454%p" /> diff --git a/java/res/xml/kbd_currency_key_styles.xml b/java/res/xml/kbd_currency_key_styles.xml new file mode 100644 index 000000000..b30dd6451 --- /dev/null +++ b/java/res/xml/kbd_currency_key_styles.xml @@ -0,0 +1,269 @@ +<?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" +> + <switch> + <case + latin:passwordInput="true" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="$" + latin:popupCharacters="@string/alternates_for_currency_dollar" /> + </case> + <!-- Countries using Euro currency, 23 countries as for January 2011. --> + <!-- 1. Andorra (ca_AD, ca_ES) --> + <case + latin:languageCode="ca" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 2. Austria (de_AT) --> +<!-- <case--> +<!-- latin:countryCode="AT"--> +<!-- >--> +<!-- <key-style--> +<!-- latin:styleName="currencyKeyStyle"--> +<!-- latin:keyLabel="€"--> +<!-- latin:popupCharacters="@string/alternates_for_currency_euro" />--> +<!-- </case>--> + <!-- 3. Belgium (nl_BE, fr_BE, de_BE) --> +<!-- <case--> +<!-- latin:countryCode="BE"--> +<!-- >--> +<!-- <key-style--> +<!-- latin:styleName="currencyKeyStyle"--> +<!-- latin:keyLabel="€"--> +<!-- latin:popupCharacters="@string/alternates_for_currency_euro" />--> +<!-- </case>--> + <!-- 4. Cyprus (el_CY, tr_CY) --> + <case + latin:countryCode="CY" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 5. Estonia (et_EE) --> +<!-- <case--> +<!-- latin:languageCode="et"--> +<!-- latin:countryCode=""--> +<!-- >--> +<!-- <key-style--> +<!-- latin:styleName="currencyKeyStyle"--> +<!-- latin:keyLabel="€"--> +<!-- latin:popupCharacters="@string/alternates_for_currency_euro" />--> +<!-- </case>--> + <!-- 6. Finland (fi_FI, sv_FI) --> + <case + latin:languageCode="fi" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 7. France (fr_FR) --> + <case + latin:languageCode="fr" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 8. Germany (de_DE) --> + <case + latin:languageCode="de" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 9. Greece (el_GR) --> + <case + latin:languageCode="el" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 10. Ireland (ga_IE, en_IE) --> + <case + latin:countryCode="IE" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 11. Italy (it_IT) --> + <case + latin:languageCode="it" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 12. Kosovo --> +<!-- <case--> +<!-- latin:countryCode="XK"--> +<!-- >--> +<!-- <key-style--> +<!-- latin:styleName="currencyKeyStyle"--> +<!-- latin:keyLabel="€"--> +<!-- latin:popupCharacters="@string/alternates_for_currency_euro" />--> +<!-- </case>--> + <!-- 13. Luxembourg (lb_LU, fr_LU, de_LU) --> + <case + latin:countryCode="LU" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 14. Malta (mt_MT, en_MT) --> + <case + latin:countryCode="MT" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 15. Monaco (fr_MO) --> +<!-- <case--> +<!-- latin:countryCode="MO"--> +<!-- >--> +<!-- <key-style--> +<!-- latin:styleName="currencyKeyStyle"--> +<!-- latin:keyLabel="€"--> +<!-- latin:popupCharacters="@string/alternates_for_currency_euro" />--> +<!-- </case>--> + <!-- 16. Montenegro (sla_ME) --> + <case + latin:countryCode="ME" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 17. Netherlands (nl_NL) --> + <case + latin:languageCode="nl" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 18. Portugal (pt_PT) --> + <case + latin:languageCode="pt" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 19. San Marino (it_SM) --> +<!-- <case--> +<!-- latin:countryCode="SM"--> +<!-- >--> +<!-- <key-style--> +<!-- latin:styleName="currencyKeyStyle"--> +<!-- latin:keyLabel="€"--> +<!-- latin:popupCharacters="@string/alternates_for_currency_euro" />--> +<!-- </case>--> + <!-- 20. Slovakia (sk_SK) --> + <case + latin:languageCode="sk" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 21. Slovenia (sl_SI) --> + <case + latin:languageCode="sl" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 22. Spain (es_ES, ca_ES) --> + <case + latin:languageCode="es" + latin:countryCode="" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="€" + latin:popupCharacters="@string/alternates_for_currency_euro" /> + </case> + <!-- 23. Vatican City (it_VA) --> +<!-- <case--> +<!-- latin:countryCode="VA"--> +<!-- >--> +<!-- <key-style--> +<!-- latin:styleName="currencyKeyStyle"--> +<!-- latin:keyLabel="€"--> +<!-- latin:popupCharacters="@string/alternates_for_currency_euro" />--> +<!-- </case>--> + <!-- United Kingdom --> + <case + latin:countryCode="GB" + > + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="£" + latin:popupCharacters="@string/alternates_for_currency_pound" /> + </case> + <default> + <key-style + latin:styleName="currencyKeyStyle" + latin:keyLabel="$" + latin:popupCharacters="@string/alternates_for_currency_dollar" /> + </default> + </switch> +</merge>
\ No newline at end of file diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml index 5d62deaa4..b3b3f4ebd 100644 --- a/java/res/xml/kbd_symbols.xml +++ b/java/res/xml/kbd_symbols.xml @@ -31,6 +31,8 @@ > <include latin:keyboardLayout="@xml/kbd_key_styles" /> + <include + latin:keyboardLayout="@xml/kbd_currency_key_styles" /> <Row latin:rowEdgeFlags="top" > @@ -71,8 +73,7 @@ <Key latin:keyLabel="\#" /> <Key - latin:keyLabel="$" - latin:popupCharacters="¢,£,€,¥,₣,₤,₱" /> + latin:keyStyle="currencyKeyStyle" /> <Key latin:keyLabel="%" latin:popupCharacters="‰" /> |