From e2d00ab470232c8ae75b1900dd7e63fd2dbd3e2d Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" <takaoka@google.com> Date: Tue, 29 Nov 2011 11:52:31 +0900 Subject: [PATCH] Support Baltic languages This change supports Estonian, Latvian, and Lithuanian languages keyboard. Bug: 5627326 Change-Id: Iaaa966e4164f9593f143e79736c8ec7befc2a5ce --- .../values-et/donottranslate-more-keys.xml | 37 +++++++++++++++++++ .../values-lt/donottranslate-more-keys.xml | 21 ++++++++--- .../values-lv/donottranslate-more-keys.xml | 24 +++++++----- java/res/xml/method.xml | 20 +++++++++- 4 files changed, 85 insertions(+), 17 deletions(-) create mode 100644 java/res/values-et/donottranslate-more-keys.xml diff --git a/java/res/values-et/donottranslate-more-keys.xml b/java/res/values-et/donottranslate-more-keys.xml new file mode 100644 index 0000000000..d6b3099ad1 --- /dev/null +++ b/java/res/values-et/donottranslate-more-keys.xml @@ -0,0 +1,37 @@ +<?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. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="more_keys_for_a">ä,Ä,à ,á,â,ã,Ã¥,æ,Ä…</string> + <string name="more_keys_for_e">3,Ä“,è,Ä—,é,ê,ë,Ä™,Ä›</string> + <string name="more_keys_for_i">8,Ä«,ì,į,Ã,î,ï,ı</string> + <string name="more_keys_for_o">9,ö,õ,ò,ó,ô,Å“,Å‘,ø</string> + <string name="more_keys_for_u">7,ü,Å«,ų,ù,ú,û,ů,ű</string> + <string name="more_keys_for_s">Å¡,ß,Å›,ÅŸ</string> + <string name="more_keys_for_n">ņ,ñ,Å„,Å„</string> + <string name="more_keys_for_c">Ä,ç,ć</string> + <string name="more_keys_for_y">6,ý,ÿ</string> + <string name="more_keys_for_d">Ä</string> + <string name="more_keys_for_r">4,Å—,Å™,Å•</string> + <string name="more_keys_for_t">5,Å£,Å¥</string> + <string name="more_keys_for_z">ž,ż,ź</string> + <string name="more_keys_for_k">Ä·</string> + <string name="more_keys_for_l">ļ,Å‚,ĺ,ľ</string> + <string name="more_keys_for_g">Ä£,ÄŸ</string> +</resources> diff --git a/java/res/values-lt/donottranslate-more-keys.xml b/java/res/values-lt/donottranslate-more-keys.xml index 6b81e45092..e36ce6a66e 100644 --- a/java/res/values-lt/donottranslate-more-keys.xml +++ b/java/res/values-lt/donottranslate-more-keys.xml @@ -18,11 +18,20 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="more_keys_for_a">Ä…,à ,á,â,ä,æ,ã,Ã¥,Ä</string> - <string name="more_keys_for_e">3,Ä—,Ä™,è,é,ê,ë,Ä“</string> - <string name="more_keys_for_i">8,į,î,ï,ì,Ã,Ä«</string> - <string name="more_keys_for_u">7,ų,Å«,û,ü,ù,ú</string> - <string name="more_keys_for_s">Å¡,ß,Å›</string> + <string name="more_keys_for_a">Ä…,ä,Ä,à ,á,â,ã,Ã¥,æ</string> + <string name="more_keys_for_e">3,Ä—,Ä™,Ä“,è,é,ê,ë,Ä›</string> + <string name="more_keys_for_i">8,į,Ä«,ì,Ã,î,ï,ı</string> + <string name="more_keys_for_o">9,ö,õ,ò,ó,ô,Å“,Å‘,ø</string> + <string name="more_keys_for_u">7,Å«,ų,ü,Å«,ù,ú,û,ů,ű</string> + <string name="more_keys_for_s">Å¡,ß,Å›,ÅŸ</string> + <string name="more_keys_for_n">ņ,ñ,Å„,Å„</string> <string name="more_keys_for_c">Ä,ç,ć</string> - <string name="more_keys_for_z">ž,ź,ż</string> + <string name="more_keys_for_y">6,ý,ÿ</string> + <string name="more_keys_for_d">Ä</string> + <string name="more_keys_for_r">4,Å—,Å™,Å•</string> + <string name="more_keys_for_t">5,Å£,Å¥</string> + <string name="more_keys_for_z">ž,ż,ź</string> + <string name="more_keys_for_k">Ä·</string> + <string name="more_keys_for_l">ļ,Å‚,ĺ,ľ</string> + <string name="more_keys_for_g">Ä£,ÄŸ</string> </resources> diff --git a/java/res/values-lv/donottranslate-more-keys.xml b/java/res/values-lv/donottranslate-more-keys.xml index 77e1c26a01..8514e738d2 100644 --- a/java/res/values-lv/donottranslate-more-keys.xml +++ b/java/res/values-lv/donottranslate-more-keys.xml @@ -18,16 +18,20 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="more_keys_for_a">Ä,à ,á,â,ä,æ,ã,Ã¥</string> - <string name="more_keys_for_e">3,Ä“,è,é,ê,ë,Ä™,Ä—</string> - <string name="more_keys_for_i">8,Ä«,î,ï,ì,Ã,į</string> - <string name="more_keys_for_u">7,Å«,û,ü,ù,ú</string> - <string name="more_keys_for_s">Å¡,ß,Å›</string> - <string name="more_keys_for_n">ņ,ñ,Å„</string> + <string name="more_keys_for_a">Ä,à ,á,â,ã,ä,Ã¥,æ,Ä…</string> + <string name="more_keys_for_e">3,Ä“,Ä—,è,é,ê,ë,Ä™,Ä›</string> + <string name="more_keys_for_i">8,Ä«,į,ì,Ã,î,ï,ı</string> + <string name="more_keys_for_o">9,ò,ó,ô,õ,ö,Å“,Å‘,ø</string> + <string name="more_keys_for_u">7,Å«,ų,ù,ú,û,ü,ů,ű</string> + <string name="more_keys_for_s">Å¡,ß,Å›,ÅŸ</string> + <string name="more_keys_for_n">ņ,ñ,Å„,Å„</string> <string name="more_keys_for_c">Ä,ç,ć</string> - <string name="more_keys_for_r">4,Å—</string> - <string name="more_keys_for_z">ž,ź,ż</string> + <string name="more_keys_for_y">6,ý,ÿ</string> + <string name="more_keys_for_d">Ä</string> + <string name="more_keys_for_r">4,Å—,Å™,Å•</string> + <string name="more_keys_for_t">5,Å£,Å¥</string> + <string name="more_keys_for_z">ž,ż,ź</string> <string name="more_keys_for_k">Ä·</string> - <string name="more_keys_for_l">ļ,Å‚</string> - <string name="more_keys_for_g">Ä£</string> + <string name="more_keys_for_l">ļ,Å‚,ĺ,ľ</string> + <string name="more_keys_for_g">Ä£,ÄŸ</string> </resources> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 6184add4d1..2b2c00c171 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -20,7 +20,7 @@ <!-- The attributes in this XML file provide configuration information --> <!-- for the Input Method Manager. --> -<!-- Keyboard: en_US, en_GB, ar, cs, da, de, de(QWERTY), es, es_US, fi, fr, fr_CA, fr_CH, hr, hu, it, iw, nb, nl, pl, pt, ru, sr, sv, tr --> +<!-- Keyboard: en_US, en_GB, ar, cs, da, de, de(QWERTY), es, es_US, et, fi, fr, fr_CA, fr_CH, hr, hu, it, iw, lt, lv, nb, nl, pl, pt, ru, sr, sv, tr --> <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. --> <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default subtype.--> @@ -75,6 +75,12 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" + android:imeSubtypeLocale="et" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" + /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" android:imeSubtypeLocale="fi" @@ -124,6 +130,18 @@ android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection" /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" + android:imeSubtypeLocale="lt" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" + android:imeSubtypeLocale="lv" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" + /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" android:imeSubtypeLocale="nb" -- GitLab