diff options
Diffstat (limited to 'java/res/xml')
35 files changed, 893 insertions, 736 deletions
diff --git a/java/res/xml/kbd_more_keys_keyboard_template.xml b/java/res/xml/kbd_more_keys_keyboard_template.xml index 8e977c5ad..537973d03 100644 --- a/java/res/xml/kbd_more_keys_keyboard_template.xml +++ b/java/res/xml/kbd_more_keys_keyboard_template.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, 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 +** 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 +** 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 +** 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. */ --> diff --git a/java/res/xml/kbd_pcqwerty.xml b/java/res/xml/kbd_pcqwerty.xml index cebca4ff7..777c71af3 100644 --- a/java/res/xml/kbd_pcqwerty.xml +++ b/java/res/xml/kbd_pcqwerty.xml @@ -21,7 +21,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:rowHeight="20%p" - latin:verticalGap="3.20%p" + latin:verticalGap="@fraction/key_bottom_gap_5row" + latin:keyLetterSize="@fraction/key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" latin:touchPositionCorrectionData="@null" > <include diff --git a/java/res/xml/kbd_pcqwerty_symbols.xml b/java/res/xml/kbd_pcqwerty_symbols.xml index fd64e5bf4..a2297f702 100644 --- a/java/res/xml/kbd_pcqwerty_symbols.xml +++ b/java/res/xml/kbd_pcqwerty_symbols.xml @@ -21,7 +21,9 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" latin:rowHeight="20%p" - latin:verticalGap="3.20%p" + latin:verticalGap="@fraction/key_bottom_gap_5row" + latin:keyLetterSize="@fraction/key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" latin:touchPositionCorrectionData="@null" > <include diff --git a/java/res/xml/kbd_thai.xml b/java/res/xml/kbd_thai.xml index 058ca16a3..b4a4a0b92 100644 --- a/java/res/xml/kbd_thai.xml +++ b/java/res/xml/kbd_thai.xml @@ -20,6 +20,11 @@ <Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + latin:rowHeight="20%p" + latin:verticalGap="@fraction/key_bottom_gap_5row" + latin:keyLetterSize="@fraction/key_letter_ratio_5row" + latin:keyShiftedLetterHintRatio="@fraction/key_uppercase_letter_ratio_5row" + latin:touchPositionCorrectionData="@null" > <include latin:keyboardLayout="@xml/rows_thai" /> diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 622da2120..162119dab 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -22,23 +22,8 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <!-- Base key style for the key which may have settings or tab key as popup key. --> - <switch> - <case - latin:clobberSettingsKey="true" - > - <key-style - latin:styleName="f1MoreKeysStyle" - latin:backgroundType="functional" /> - </case> - <!-- clobberSettingsKey="false" --> - <default> - <key-style - latin:styleName="f1MoreKeysStyle" - latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!text/settings_as_more_key" - latin:backgroundType="functional" /> - </default> - </switch> + <include + latin:keyboardLayout="@xml/key_styles_f1" /> <!-- Functional key styles --> <switch> <case diff --git a/java/res/xml/key_styles_f1.xml b/java/res/xml/key_styles_f1.xml new file mode 100644 index 000000000..8dfc3cb84 --- /dev/null +++ b/java/res/xml/key_styles_f1.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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" +> + <!-- Base key style for the key which may have settings or tab key as popup key. --> + <!-- Kept as a separate file for cleaner overriding by an overlay. --> + <switch> + <case + latin:clobberSettingsKey="true" + > + <key-style + latin:styleName="f1MoreKeysStyle" + latin:backgroundType="functional" /> + </case> + <!-- clobberSettingsKey="false" --> + <default> + <key-style + latin:styleName="f1MoreKeysStyle" + latin:keyLabelFlags="hasPopupHint" + latin:moreKeys="!text/settings_as_more_key" + latin:backgroundType="functional" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/kbd_esperanto.xml b/java/res/xml/key_thai_kho_khuat.xml index c0c45dd11..0ffd0f924 100644 --- a/java/res/xml/kbd_esperanto.xml +++ b/java/res/xml/key_thai_kho_khuat.xml @@ -18,9 +18,23 @@ */ --> -<Keyboard +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <include - latin:keyboardLayout="@xml/rows_esperanto" /> -</Keyboard> + <switch> + <case + latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" + > + <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON --> + <Key + latin:keyLabel="ฅ" + latin:keyLabelFlags="fontNormal" /> + </case> + <default> + <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT --> + <Key + latin:keyLabel="ฃ" + latin:keyLabelFlags="fontNormal" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/keyboard_layout_set_esperanto.xml b/java/res/xml/keyboard_layout_set_esperanto.xml deleted file mode 100644 index 94a386d6c..000000000 --- a/java/res/xml/keyboard_layout_set_esperanto.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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. -*/ ---> - -<KeyboardLayoutSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> - <Element - latin:elementName="alphabet" - latin:elementKeyboard="@xml/kbd_esperanto" - latin:enableProximityCharsCorrection="true" /> - <Element - latin:elementName="symbols" - latin:elementKeyboard="@xml/kbd_symbols" /> - <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> - <Element - latin:elementName="phone" - latin:elementKeyboard="@xml/kbd_phone" /> - <Element - latin:elementName="phoneSymbols" - latin:elementKeyboard="@xml/kbd_phone_symbols" /> - <Element - latin:elementName="number" - latin:elementKeyboard="@xml/kbd_number" /> -</KeyboardLayoutSet> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 8d4b85d9e..83eafd038 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -22,17 +22,19 @@ <!-- Supported subtypes keyboard_locale: script_name/keyboard_layout_set[:keyboard_locale] + af: Afrikaans/qwerty ar: Arabic/arabic be: Belarusian/east_slavic bg: Bulgarian/bulgarian bg: Bulgarian/bulgarian_bds + ca: Catalan/spanish cs: Czech/qwertz da: Danish/nordic de: German/qwertz el: Greek/greek en_US: English United States/qwerty en_GB: English Great Britain/qwerty - eo: Esperanto/esperanto + eo: Esperanto/spanish es: Spanish/spanish et: Estonian/nordic fa: Persian/arabic @@ -42,14 +44,16 @@ hi: Hindi/hindi hr: Croatian/qwertz hu: Hungarian/qwertz + in: Indonesian/qwerty # "id" is official language code of Indonesian. is: Icelandic/qwerty it: Italian/qwerty - iw: Hebrew/hebrew + iw: Hebrew/hebrew # "he" is official language code of Hebrew. ka: Georgian/georgian ky: Kyrgyz/east_slavic lt: Lithuanian/qwerty lv: Latvian/qwerty mk: Macedonian/south_slavic + ms: Malay/qwerty nb: Norwegian Bokmål/nordic nl: Dutch/qwerty nl_BE: Dutch Belgium/azerty @@ -61,14 +65,20 @@ sk: Slovak/qwerty sl: Slovenian/qwerty sr: Serbian/south_slavic + (sr-Latn: Serbian/qwerty) # not yet implemented. sv: Swedish/nordic + sw: Swahili/qwerty th: Thai/thai + tl: Tagalog/spanish tr: Turkish/qwerty uk: Ukrainian/east_slavic vi: Vietnamese/qwerty + zu: Zulu/qwerty zz: QWERTY/qwerty --> <!-- TODO: use <lang>_keyboard icon instead of a common keyboard icon. --> +<!-- Note: SupportTouchPositionCorrection extra value is obsolete and maintained for backward + compatibility. --> <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default subtype.--> <input-method xmlns:android="http://schemas.android.com/apk/res/android" @@ -76,132 +86,176 @@ android:isDefault="@bool/im_is_default"> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_en_US" + android:subtypeId="-921088104" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_en_GB" + android:subtypeId="-1337596075" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="1872175968" + android:imeSubtypeLocale="af" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" + android:subtypeId="1494081088" android:imeSubtypeLocale="ar" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="499361881" android:imeSubtypeLocale="be" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="195674344" android:imeSubtypeLocale="bg" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_bulgarian_bds" + android:subtypeId="1599191706" android:imeSubtypeLocale="bg" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-756735787" + android:imeSubtypeLocale="ca" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" + android:subtypeId="758984400" android:imeSubtypeLocale="cs" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="770990173" android:imeSubtypeLocale="da" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="774684257" android:imeSubtypeLocale="de" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="242746067" android:imeSubtypeLocale="el" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=greek" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="1083200842" android:imeSubtypeLocale="eo" android:imeSubtypeMode="keyboard" - android:imeSubtypeExtraValue="KeyboardLayoutSet=esperanto,AsciiCapable" + android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="816242702" android:imeSubtypeLocale="es" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-332580523" android:imeSubtypeLocale="et" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=nordic,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-1100561836" android:imeSubtypeLocale="fa" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=farsi" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="835636643" android:imeSubtypeLocale="fi" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="843948332" android:imeSubtypeLocale="fr" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-354699631" android:imeSubtypeLocale="fr_CA" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="963984255" android:imeSubtypeLocale="hi" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="901206634" android:imeSubtypeLocale="hr" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="903977197" android:imeSubtypeLocale="hu" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> + <!-- Java uses the deprecated "in" code instead of the standard "id" code for Indonesian. --> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" + android:subtypeId="2108597344" + android:imeSubtypeLocale="in" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" + /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="2113214949" android:imeSubtypeLocale="is" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="931682827" android:imeSubtypeLocale="it" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" @@ -209,48 +263,63 @@ <!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. --> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="1727731901" android:imeSubtypeLocale="iw" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="1846648426" android:imeSubtypeLocale="ka" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=georgian" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="775494660" android:imeSubtypeLocale="ky" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-2094941373" android:imeSubtypeLocale="lt" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-2093094331" android:imeSubtypeLocale="lv" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-1353667716" android:imeSubtypeLocale="mk" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=south_slavic" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-2067235743" + android:imeSubtypeLocale="ms" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" + android:subtypeId="1058205204" android:imeSubtypeLocale="nb" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="1067440414" android:imeSubtypeLocale="nl" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" @@ -263,84 +332,135 @@ /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="1124698716" android:imeSubtypeLocale="pl" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-889195354" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-486540198" android:imeSubtypeLocale="pt_PT" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-1927784072" android:imeSubtypeLocale="ro" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="1983547218" android:imeSubtypeLocale="ru" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-1902849005" android:imeSubtypeLocale="sk" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-1901925484" android:imeSubtypeLocale="sl" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="2009405806" android:imeSubtypeLocale="sr" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="SupportTouchPositionCorrection" /> + <!-- TODO: Uncomment once we can handle IETF language tag with script name specified. + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_serbian_cyrillic" + android:subtypeId="XXXXXX" + android:imeSubtypeLocale="sr" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="SupportTouchPositionCorrection" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_serbian_latin" + android:subtypeId="XXXXXX" + android:imeSubtypeLocale="sr-Latn" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" + /> + --> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="1219821379" android:imeSubtypeLocale="sv" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-1891766753" + android:imeSubtypeLocale="sw" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" + android:subtypeId="529847764" android:imeSubtypeLocale="th" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=thai" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-259881489" + android:imeSubtypeLocale="tl" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" + android:subtypeId="1244756446" android:imeSubtypeLocale="tr" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="1048856876" android:imeSubtypeLocale="uk" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic" /> <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_generic" + android:subtypeId="-1818808594" android:imeSubtypeLocale="vi" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" /> <subtype android:icon="@drawable/ic_subtype_keyboard" + android:label="@string/subtype_generic" + android:subtypeId="-1693209738" + android:imeSubtypeLocale="zu" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable" + /> + <subtype android:icon="@drawable/ic_subtype_keyboard" android:label="@string/subtype_no_language_qwerty" + android:subtypeId="-1573262419" android:imeSubtypeLocale="zz" android:imeSubtypeMode="keyboard" android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EnabledWhenDefaultIsNotAsciiCapable" diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 137981949..478dc0f80 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -81,19 +81,33 @@ android:title="@string/misc_category" android:key="misc_settings"> <CheckBoxPreference - android:key="usability_study_mode" - android:title="@string/prefs_usability_study_mode" + android:key="next_word_prediction" + android:title="@string/bigram_prediction" + android:summary="@string/bigram_prediction_summary" android:persistent="true" - android:defaultValue="false" /> + android:defaultValue="true" /> + <CheckBoxPreference + android:key="gesture_input" + android:title="@string/gesture_input" + android:summary="@string/gesture_input_summary" + android:persistent="true" + android:defaultValue="true" /> <PreferenceScreen android:key="pref_advanced_settings" android:title="@string/advanced_settings" android:summary="@string/advanced_settings_summary"> <CheckBoxPreference - android:key="pref_suppress_language_switch_key" - android:title="@string/suppress_language_switch_key" + android:key="pref_key_use_contacts_dict" + android:title="@string/use_contacts_dict" + android:summary="@string/use_contacts_dict_summary" android:persistent="true" - android:defaultValue="false" /> + android:defaultValue="true" /> + <CheckBoxPreference + android:key="pref_show_language_switch_key" + android:title="@string/show_language_switch_key" + android:summary="@string/show_language_switch_key_summary" + android:persistent="true" + android:defaultValue="true" /> <CheckBoxPreference android:key="pref_include_other_imes_in_language_switch_list" android:title="@string/include_other_imes_in_language_switch_list" @@ -108,36 +122,28 @@ <ListPreference android:key="pref_key_preview_popup_dismiss_delay" android:title="@string/key_preview_popup_dismiss_delay" /> - <CheckBoxPreference - android:key="pref_key_use_contacts_dict" - android:title="@string/use_contacts_dict" - android:summary="@string/use_contacts_dict_summary" - android:persistent="true" - android:defaultValue="true" /> - <CheckBoxPreference - android:key="next_word_suggestion" - android:title="@string/bigram_suggestion" - android:summary="@string/bigram_suggestion_summary" - android:persistent="true" - android:defaultValue="true" /> - <CheckBoxPreference - android:key="next_word_prediction" - android:title="@string/bigram_prediction" - android:summary="@string/bigram_prediction_summary" - android:persistent="true" - android:defaultValue="true" /> - <CheckBoxPreference - android:key="enable_span_insert" - android:title="@string/enable_span_insert" - android:summary="@string/enable_span_insert_summary" - android:persistent="true" - android:defaultValue="true" /> <PreferenceScreen android:key="pref_vibration_duration_settings" android:title="@string/prefs_keypress_vibration_duration_settings"/> <PreferenceScreen android:key="pref_keypress_sound_volume" android:title="@string/prefs_keypress_sound_volume_settings" /> + <CheckBoxPreference + android:key="pref_gesture_preview_trail" + android:title="@string/gesture_preview_trail" + android:persistent="true" + android:defaultValue="true" /> + <CheckBoxPreference + android:key="pref_show_gesture_floating_preview_text" + android:title="@string/gesture_floating_preview_text" + android:summary="@string/gesture_floating_preview_text_summary" + android:persistent="true" + android:defaultValue="false" /> </PreferenceScreen> + <PreferenceScreen + android:key="debug_settings" + android:title="Debug settings" + android:persistent="true" + android:defaultValue="false" /> </PreferenceCategory> </PreferenceScreen> diff --git a/java/res/xml/prefs_for_debug.xml b/java/res/xml/prefs_for_debug.xml index b926ed065..605a02f07 100644 --- a/java/res/xml/prefs_for_debug.xml +++ b/java/res/xml/prefs_for_debug.xml @@ -48,4 +48,10 @@ android:persistent="true" android:defaultValue="false" /> + + <CheckBoxPreference + android:key="usability_study_mode" + android:title="@string/prefs_usability_study_mode" + android:persistent="true" + android:defaultValue="false" /> </PreferenceScreen> diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml index b1bf790e4..a4bef83c6 100644 --- a/java/res/xml/rowkeys_arabic1.xml +++ b/java/res/xml/rowkeys_arabic1.xml @@ -26,13 +26,15 @@ <Key latin:keyLabel="ض" latin:keyHintLabel="1" - latin:additionalMoreKeys="1,١" /> + latin:additionalMoreKeys="1,١" + latin:keyLabelFlags="fontNormal" /> <!-- U+0635: "ص" ARABIC LETTER SAD U+0662: "٢" ARABIC-INDIC DIGIT TWO --> <Key latin:keyLabel="ص" latin:keyHintLabel="2" - latin:additionalMoreKeys="2,٢" /> + latin:additionalMoreKeys="2,٢" + latin:keyLabelFlags="fontNormal" /> <!-- U+0642: "ق" ARABIC LETTER QAF U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE U+0663: "٣" ARABIC-INDIC DIGIT THREE --> @@ -41,7 +43,8 @@ latin:keyLabel="ق" latin:keyHintLabel="3" latin:additionalMoreKeys="3,٣" - latin:moreKeys="ڨ" /> + latin:moreKeys="ڨ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0641: "ف" ARABIC LETTER FEH U+06A4: "ڤ" ARABIC LETTER VEH U+06A2: "ڢ" ARABIC LETTER FEH WITH DOT MOVED BELOW @@ -53,19 +56,22 @@ latin:keyLabel="ف" latin:keyHintLabel="4" latin:additionalMoreKeys="4,٤" - latin:moreKeys="ڤ,ڢ,ڥ" /> + latin:moreKeys="ڤ,ڢ,ڥ" + latin:keyLabelFlags="fontNormal" /> <!-- U+063A: "غ" ARABIC LETTER GHAIN U+0665: "٥" ARABIC-INDIC DIGIT FIVE --> <Key latin:keyLabel="غ" latin:keyHintLabel="5" - latin:additionalMoreKeys="5,٥" /> + latin:additionalMoreKeys="5,٥" + latin:keyLabelFlags="fontNormal" /> <!-- U+0639: "ع" ARABIC LETTER AIN U+0666: "٦" ARABIC-INDIC DIGIT SIX --> <Key latin:keyLabel="ع" latin:keyHintLabel="6" - latin:additionalMoreKeys="6,٦" /> + latin:additionalMoreKeys="6,٦" + latin:keyLabelFlags="fontNormal" /> <!-- U+0647: "ه" ARABIC LETTER HEH U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM U+0647 U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER @@ -74,19 +80,22 @@ latin:keyLabel="ه" latin:keyHintLabel="7" latin:additionalMoreKeys="7,٧" - latin:moreKeys="ﻫ|ه‍" /> + latin:moreKeys="ﻫ|ه‍" + latin:keyLabelFlags="fontNormal" /> <!-- U+062E: "خ" ARABIC LETTER KHAH U+0668: "٨" ARABIC-INDIC DIGIT EIGHT --> <Key latin:keyLabel="خ" latin:keyHintLabel="8" - latin:additionalMoreKeys="8,٨" /> + latin:additionalMoreKeys="8,٨" + latin:keyLabelFlags="fontNormal" /> <!-- U+062D: "ح" ARABIC LETTER HAH U+0669: "٩" ARABIC-INDIC DIGIT NINE --> <Key latin:keyLabel="ح" latin:keyHintLabel="9" - latin:additionalMoreKeys="9,٩" /> + latin:additionalMoreKeys="9,٩" + latin:keyLabelFlags="fontNormal" /> <!-- U+062C: "ج" ARABIC LETTER JEEM U+0686: "چ" ARABIC LETTER TCHEH U+0660: "٠" ARABIC-INDIC DIGIT ZERO --> @@ -94,5 +103,6 @@ latin:keyLabel="ج" latin:keyHintLabel="0" latin:additionalMoreKeys="0,٠" - latin:moreKeys="چ" /> + latin:moreKeys="چ" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml index f86aae014..d733f6411 100644 --- a/java/res/xml/rowkeys_arabic2.xml +++ b/java/res/xml/rowkeys_arabic2.xml @@ -26,21 +26,25 @@ <!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE --> <Key latin:keyLabel="ش" - latin:moreKeys="ڜ" /> + latin:moreKeys="ڜ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0633: "س" ARABIC LETTER SEEN --> <Key - latin:keyLabel="س" /> + latin:keyLabel="س" + latin:keyLabelFlags="fontNormal" /> <!-- U+064A: "ي" ARABIC LETTER YEH U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> <Key latin:keyLabel="ي" - latin:moreKeys="ئ,ى" /> + latin:moreKeys="ئ,ى" + latin:keyLabelFlags="fontNormal" /> <!-- U+0628: "ب" ARABIC LETTER BEH U+067E: "پ" ARABIC LETTER PEH --> <Key latin:keyLabel="ب" - latin:moreKeys="پ" /> + latin:moreKeys="پ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0644: "ل" ARABIC LETTER LAM U+FEFB: "ﻻ" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM U+0627: "ا" ARABIC LETTER ALEF @@ -52,7 +56,8 @@ U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key latin:keyLabel="ل" - latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" /> + latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0627: "ا" ARABIC LETTER ALEF U+0621: "ء" ARABIC LETTER HAMZA U+0671: "ٱ" ARABIC LETTER ALEF WASLA @@ -61,23 +66,27 @@ U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE --> <Key latin:keyLabel="ا" - latin:moreKeys="ء,ٱ,أ,إ,آ" /> + latin:moreKeys="ء,ٱ,أ,إ,آ" + latin:keyLabelFlags="fontNormal" /> <!-- U+062A: "ت" ARABIC LETTER TEH U+062B: "ﺙ" ARABIC LETTER THEH --> <Key latin:keyLabel="ت" - latin:moreKeys="ث" /> + latin:moreKeys="ث" + latin:keyLabelFlags="fontNormal" /> <!-- U+0646: "ن" ARABIC LETTER NOON --> <Key - latin:keyLabel="ن" /> + latin:keyLabel="ن" + latin:keyLabelFlags="fontNormal" /> <!-- U+0645: "م" ARABIC LETTER MEEM --> <Key - latin:keyLabel="م" /> + latin:keyLabel="م" + latin:keyLabelFlags="fontNormal" /> <!-- U+0643: "ك" ARABIC LETTER KAF U+06AF: "گ" ARABIC LETTER GAF U+06A9: "ک" ARABIC LETTER KEHEH --> <Key latin:keyLabel="ك" latin:moreKeys="گ,ک" - latin:keyWidth="fillRight" /> + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml/rowkeys_arabic3.xml b/java/res/xml/rowkeys_arabic3.xml index 9e9eac0d9..e4e694812 100644 --- a/java/res/xml/rowkeys_arabic3.xml +++ b/java/res/xml/rowkeys_arabic3.xml @@ -23,30 +23,38 @@ > <!-- U+0638: "ظ" ARABIC LETTER ZAH --> <Key - latin:keyLabel="ظ" /> + latin:keyLabel="ظ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0637: "ط" ARABIC LETTER TAH --> <Key - latin:keyLabel="ط" /> + latin:keyLabel="ط" + latin:keyLabelFlags="fontNormal" /> <!-- U+0630: "ذ" ARABIC LETTER THAL --> <Key - latin:keyLabel="ذ" /> + latin:keyLabel="ذ" + latin:keyLabelFlags="fontNormal" /> <!-- U+062F: "د" ARABIC LETTER DAL --> <Key - latin:keyLabel="د" /> + latin:keyLabel="د" + latin:keyLabelFlags="fontNormal" /> <!-- U+0632: "ز" ARABIC LETTER ZAIN U+0698: "ژ" ARABIC LETTER JEH --> <Key latin:keyLabel="ز" - latin:moreKeys="ژ" /> + latin:moreKeys="ژ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0631: "ر" ARABIC LETTER REH --> <Key - latin:keyLabel="ر" /> + latin:keyLabel="ر" + latin:keyLabelFlags="fontNormal" /> <!-- U+0629: "ة" ARABIC LETTER TEH MARBUTA --> <Key - latin:keyLabel="ة" /> + latin:keyLabel="ة" + latin:keyLabelFlags="fontNormal" /> <!-- U+0648: "و" ARABIC LETTER WAW U+0624: "ﺅ" ARABIC LETTER WAW WITH HAMZA ABOVE --> <Key latin:keyLabel="و" - latin:moreKeys="ؤ" /> + latin:moreKeys="ؤ" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml/rowkeys_east_slavic1.xml b/java/res/xml/rowkeys_east_slavic1.xml index 00cb6a973..c1b43bd36 100644 --- a/java/res/xml/rowkeys_east_slavic1.xml +++ b/java/res/xml/rowkeys_east_slavic1.xml @@ -47,7 +47,7 @@ latin:keyLabel="е" latin:keyHintLabel="5" latin:additionalMoreKeys="5" - latin:moreKeys="!text/more_keys_for_cyrillic_ye" /> + latin:moreKeys="!text/more_keys_for_cyrillic_ie" /> <!-- U+043D: "н" CYRILLIC SMALL LETTER EN --> <Key latin:keyLabel="н" @@ -58,7 +58,8 @@ <Key latin:keyLabel="г" latin:keyHintLabel="7" - latin:additionalMoreKeys="7" /> + latin:additionalMoreKeys="7" + latin:moreKeys="!text/more_keys_for_cyrillic_ghe" /> <!-- U+0448: "ш" CYRILLIC SMALL LETTER SHA --> <Key latin:keyLabel="ш" @@ -75,6 +76,5 @@ latin:additionalMoreKeys="0" /> <!-- U+0445: "х" CYRILLIC SMALL LETTER HA --> <Key - latin:keyLabel="х" - latin:moreKeys="!text/more_keys_for_cyrillic_ha" /> + latin:keyLabel="х" /> </merge> diff --git a/java/res/xml/rowkeys_east_slavic2.xml b/java/res/xml/rowkeys_east_slavic2.xml index c635af2d9..9743727c1 100644 --- a/java/res/xml/rowkeys_east_slavic2.xml +++ b/java/res/xml/rowkeys_east_slavic2.xml @@ -52,7 +52,6 @@ <!-- U+0436: "ж" CYRILLIC SMALL LETTER ZHE --> <Key latin:keyLabel="ж" /> - <!-- U+044D: "э" CYRILLIC SMALL LETTER E --> <Key - latin:keyLabel="э" /> + latin:keyLabel="!text/keylabel_for_east_slavic_row2_11" /> </merge> diff --git a/java/res/xml/rowkeys_esperanto1.xml b/java/res/xml/rowkeys_esperanto1.xml deleted file mode 100644 index 6994d4b5e..000000000 --- a/java/res/xml/rowkeys_esperanto1.xml +++ /dev/null @@ -1,125 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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" -> - <!-- U+015D: "ŝ" LATIN SMALL LETTER S WITH CIRCUMFLEX --> - <Key - latin:keyLabel="ŝ" - latin:keyHintLabel="1" - latin:additionalMoreKeys="1" - latin:moreKeys="q" /> - <!-- U+011D: "ĝ" LATIN SMALL LETTER G WITH CIRCUMFLEX - U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX --> - <Key - latin:keyLabel="ĝ" - latin:keyHintLabel="2" - latin:additionalMoreKeys="2" - latin:moreKeys="w,ŵ" /> - <!-- U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE - U+011B: "ě" LATIN SMALL LETTER E WITH CARON - U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE - U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX - U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS - U+0119: "ę" LATIN SMALL LETTER E WITH OGONEK - U+0117: "ė" LATIN SMALL LETTER E WITH DOT ABOVE - U+0113: "ē" LATIN SMALL LETTER E WITH MACRON --> - <Key - latin:keyLabel="e" - latin:keyHintLabel="3" - latin:additionalMoreKeys="3" - latin:moreKeys="é,ě,è,ê,ë,ę,ė,ē" /> - <!-- U+0159: "ř" LATIN SMALL LETTER R WITH CARON - U+0155: "ŕ" LATIN SMALL LETTER R WITH ACUTE - U+0157: "ŗ" LATIN SMALL LETTER R WITH CEDILLA --> - <Key - latin:keyLabel="r" - latin:keyHintLabel="4" - latin:additionalMoreKeys="4" - latin:moreKeys="ř,ŕ,ŗ" /> - <!-- U+0165: "ť" LATIN SMALL LETTER T WITH CARON - U+021B: "ț" LATIN SMALL LETTER T WITH COMMA BELOW - U+0163: "ţ" LATIN SMALL LETTER T WITH CEDILLA - U+0167: "ŧ" LATIN SMALL LETTER T WITH STROKE --> - <Key - latin:keyLabel="t" - latin:keyHintLabel="5" - latin:additionalMoreKeys="5" - latin:moreKeys="ť,ț,ţ,ŧ" /> - <!-- U+016D: "ŭ" LATIN SMALL LETTER U WITH BREVE - U+00FD: "ý" LATIN SMALL LETTER Y WITH ACUTE - U+0177: "ŷ" LATIN SMALL LETTER Y WITH CIRCUMFLEX - U+00FF: "ÿ" LATIN SMALL LETTER Y WITH DIAERESIS - U+00FE: "þ" LATIN SMALL LETTER THORN --> - <Key - latin:keyLabel="ŭ" - latin:keyHintLabel="6" - latin:additionalMoreKeys="6" - latin:moreKeys="y,ý,ŷ,ÿ,þ" /> - <!-- U+00FA: "ú" LATIN SMALL LETTER U WITH ACUTE - U+016F: "ů" LATIN SMALL LETTER U WITH RING ABOVE - U+00FB: "û" LATIN SMALL LETTER U WITH CIRCUMFLEX - U+00FC: "ü" LATIN SMALL LETTER U WITH DIAERESIS - U+00F9: "ù" LATIN SMALL LETTER U WITH GRAVE - U+016B: "ū" LATIN SMALL LETTER U WITH MACRON - U+0169: "ũ" LATIN SMALL LETTER U WITH TILDE - U+0171: "ű" LATIN SMALL LETTER U WITH DOUBLE ACUTE - U+0173: "ų" LATIN SMALL LETTER U WITH OGONEK - U+00B5: "µ" MICRO SIGN --> - <Key - latin:keyLabel="u" - latin:keyHintLabel="7" - latin:additionalMoreKeys="7" - latin:moreKeys="ú,ů,û,ü,ù,ū,ũ,ű,ų,µ" /> - <!-- U+00ED: "í" LATIN SMALL LETTER I WITH ACUTE - U+00EE: "î" LATIN SMALL LETTER I WITH CIRCUMFLEX - U+00EF: "ï" LATIN SMALL LETTER I WITH DIAERESIS - U+0129: "ĩ" LATIN SMALL LETTER I WITH TILDE - U+00EC: "ì" LATIN SMALL LETTER I WITH GRAVE - U+012F: "į" LATIN SMALL LETTER I WITH OGONEK - U+012B: "ī" LATIN SMALL LETTER I WITH MACRON - U+0131: "ı" LATIN SMALL LETTER DOTLESS I - U+0133: "ij" LATIN SMALL LIGATURE IJ --> - <Key - latin:keyLabel="i" - latin:keyHintLabel="8" - latin:additionalMoreKeys="8" - latin:moreKeys="í,î,ï,ĩ,ì,į,ī,ı,ij" /> - <!-- U+00F3: "ó" LATIN SMALL LETTER O WITH ACUTE - U+00F6: "ö" LATIN SMALL LETTER O WITH DIAERESIS - U+00F4: "ô" LATIN SMALL LETTER O WITH CIRCUMFLEX - U+00F2: "ò" LATIN SMALL LETTER O WITH GRAVE - U+00F5: "õ" LATIN SMALL LETTER O WITH TILDE - U+0153: "œ" LATIN SMALL LIGATURE OE - U+00F8: "ø" LATIN SMALL LETTER O WITH STROKE - U+014D: "ō" LATIN SMALL LETTER O WITH MACRON - U+0151: "ő" LATIN SMALL LETTER O WITH DOUBLE ACUTE - U+00BA: "º" MASCULINE ORDINAL INDICATOR --> - <Key - latin:keyLabel="o" - latin:keyHintLabel="9" - latin:additionalMoreKeys="9" - latin:moreKeys="ó,ö,ô,ò,õ,œ,ø,ō,ő,º" /> - <Key - latin:keyLabel="p" - latin:keyHintLabel="0" - latin:additionalMoreKeys="0" /> -</merge> diff --git a/java/res/xml/rowkeys_esperanto2.xml b/java/res/xml/rowkeys_esperanto2.xml deleted file mode 100644 index ebc968a70..000000000 --- a/java/res/xml/rowkeys_esperanto2.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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" -> - <!-- U+00E1: "á" LATIN SMALL LETTER A WITH ACUTE - U+00E0: "à" LATIN SMALL LETTER A WITH GRAVE - U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX - U+00E4: "ä" LATIN SMALL LETTER A WITH DIAERESIS - U+00E6: "æ" LATIN SMALL LETTER AE - U+00E3: "ã" LATIN SMALL LETTER A WITH TILDE - U+00E5: "å" LATIN SMALL LETTER A WITH RING ABOVE - U+0101: "ā" LATIN SMALL LETTER A WITH MACRON - U+0103: "ă" LATIN SMALL LETTER A WITH BREVE - U+0105: "ą" LATIN SMALL LETTER A WITH OGONEK - U+00AA: "ª" FEMININE ORDINAL INDICATOR --> - <Key - latin:keyLabel="a" - latin:moreKeys="á,à,â,ä,æ,ã,å,ā,ă,ą,ª" /> - <!-- U+00DF: "ß" LATIN SMALL LETTER SHARP S - U+0161: "š" LATIN SMALL LETTER S WITH CARON - U+015B: "ś" LATIN SMALL LETTER S WITH ACUTE - U+0219: "ș" LATIN SMALL LETTER S WITH COMMA BELOW - U+015F: "ş" LATIN SMALL LETTER S WITH CEDILLA --> - <Key - latin:keyLabel="s" - latin:moreKeys="ß,š,ś,ș,ş" /> - <!-- U+00F0: "ð" LATIN SMALL LETTER ETH - U+010F: "ď" LATIN SMALL LETTER D WITH CARON - U+0111: "đ" LATIN SMALL LETTER D WITH STROKE --> - <Key - latin:keyLabel="d" - latin:moreKeys="ð,ď,đ" /> - <Key - latin:keyLabel="f" /> - <!-- U+011F: "ğ" LATIN SMALL LETTER G WITH BREVE - U+0121: "ġ" LATIN SMALL LETTER G WITH DOT ABOVE - U+0123: "ģ" LATIN SMALL LETTER G WITH CEDILLA --> - <Key - latin:keyLabel="g" - latin:moreKeys="ğ,ġ,ģ" /> - <!-- U+0125: "ĥ" LATIN SMALL LETTER H WITH CIRCUMFLEX - U+0127: "ħ" LATIN SMALL LETTER H WITH STROKE --> - <Key - latin:keyLabel="h" - latin:moreKeys="ĥ,ħ" /> - <Key - latin:keyLabel="j" /> - <!-- U+0137: "ķ" LATIN SMALL LETTER K WITH CEDILLA - U+0138: "ĸ" LATIN SMALL LETTER KRA --> - <Key - latin:keyLabel="k" - latin:moreKeys="ķ,ĸ" /> - <!-- U+013A: "ĺ" LATIN SMALL LETTER L WITH ACUTE - U+013C: "ļ" LATIN SMALL LETTER L WITH CEDILLA - U+013E: "ľ" LATIN SMALL LETTER L WITH CARON - U+0140: "ŀ" LATIN SMALL LETTER L WITH MIDDLE DOT - U+0142: "ł" LATIN SMALL LETTER L WITH STROKE --> - <Key - latin:keyLabel="l" - latin:moreKeys="ĺ,ļ,ľ,ŀ,ł" /> - <!-- U+0135: "ĵ" LATIN SMALL LETTER J WITH CIRCUMFLEX --> - <Key - latin:keyLabel="ĵ" /> -</merge> diff --git a/java/res/xml/rowkeys_esperanto3.xml b/java/res/xml/rowkeys_esperanto3.xml deleted file mode 100644 index b2eab8d60..000000000 --- a/java/res/xml/rowkeys_esperanto3.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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" -> - <!-- U+017A: "ź" LATIN SMALL LETTER Z WITH ACUTE - U+017C: "ż" LATIN SMALL LETTER Z WITH DOT ABOVE - U+017E: "ž" LATIN SMALL LETTER Z WITH CARON --> - <Key - latin:keyLabel="z" - latin:moreKeys="ź,ż,ž" /> - <!-- U+0109: "ĉ" LATIN SMALL LETTER C WITH CIRCUMFLEX --> - <Key - latin:keyLabel="ĉ" - latin:moreKeys="x" /> - <!-- U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE - U+010D: "č" LATIN SMALL LETTER C WITH CARON - U+00E7: "ç" LATIN SMALL LETTER C WITH CEDILLA - U+010B: "ċ" LATIN SMALL LETTER C WITH DOT ABOVE --> - <Key - latin:keyLabel="c" - latin:moreKeys="ć,č,ç,ċ" /> - <!-- U+0175: "ŵ" LATIN SMALL LETTER W WITH CIRCUMFLEX --> - <Key - latin:keyLabel="v" - latin:moreKeys="w,ŵ" /> - <Key - latin:keyLabel="b" /> - <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE - U+0144: "ń" LATIN SMALL LETTER N WITH ACUTE - U+0146: "ņ" LATIN SMALL LETTER N WITH CEDILLA - U+0148: "ň" LATIN SMALL LETTER N WITH CARON - U+0149: "ʼn" LATIN SMALL LETTER N PRECEDED BY APOSTROPHE - U+014B: "ŋ" LATIN SMALL LETTER ENG --> - <Key - latin:keyLabel="n" - latin:moreKeys="ñ,ń,ņ,ň,ʼn,ŋ" /> - <Key - latin:keyLabel="m" /> -</merge> diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml index 840b048f7..0ccf1ab54 100644 --- a/java/res/xml/rowkeys_farsi1.xml +++ b/java/res/xml/rowkeys_farsi1.xml @@ -28,31 +28,36 @@ latin:keyLabel="ص" latin:moreKeys="ض,%" latin:keyHintLabel="۱" - latin:additionalMoreKeys="۱,1" /> + latin:additionalMoreKeys="۱,1" + latin:keyLabelFlags="fontNormal" /> <!-- U+0642: "ق" ARABIC LETTER QAF U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO --> <Key latin:keyLabel="ق" latin:keyHintLabel="۲" - latin:additionalMoreKeys="۲,2" /> + latin:additionalMoreKeys="۲,2" + latin:keyLabelFlags="fontNormal" /> <!-- U+0641: "ف" ARABIC LETTER FEH U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE --> <Key latin:keyLabel="ف" latin:keyHintLabel="۳" - latin:additionalMoreKeys="۳,3" /> + latin:additionalMoreKeys="۳,3" + latin:keyLabelFlags="fontNormal" /> <!-- U+063A: "غ" ARABIC LETTER GHAIN U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR --> <Key latin:keyLabel="غ" latin:keyHintLabel="۴" - latin:additionalMoreKeys="۴,4" /> + latin:additionalMoreKeys="۴,4" + latin:keyLabelFlags="fontNormal" /> <!-- U+0639: "ع" ARABIC LETTER AIN U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE --> <Key latin:keyLabel="ع" latin:keyHintLabel="۵" - latin:additionalMoreKeys="۵,5" /> + latin:additionalMoreKeys="۵,5" + latin:keyLabelFlags="fontNormal" /> <!-- U+0647: "ه" ARABIC LETTER HEH U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER @@ -63,29 +68,34 @@ latin:keyLabel="ه" latin:moreKeys="ﻫ|ه‍,هٔ,ة,%" latin:keyHintLabel="۶" - latin:additionalMoreKeys="۶,6" /> + latin:additionalMoreKeys="۶,6" + latin:keyLabelFlags="fontNormal" /> <!-- U+062E: "خ" ARABIC LETTER KHAH U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN --> <Key latin:keyLabel="خ" latin:keyHintLabel="۷" - latin:additionalMoreKeys="۷,7" /> + latin:additionalMoreKeys="۷,7" + latin:keyLabelFlags="fontNormal" /> <!-- U+062D: "ح" ARABIC LETTER HAH U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT --> <Key latin:keyLabel="ح" latin:keyHintLabel="۸" - latin:additionalMoreKeys="۸,8" /> + latin:additionalMoreKeys="۸,8" + latin:keyLabelFlags="fontNormal" /> <!-- U+062C: "ج" ARABIC LETTER JEEM U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE --> <Key latin:keyLabel="ج" latin:keyHintLabel="۹" - latin:additionalMoreKeys="۹,9" /> + latin:additionalMoreKeys="۹,9" + latin:keyLabelFlags="fontNormal" /> <!-- U+0686: "چ" ARABIC LETTER TCHEH U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO --> <Key latin:keyLabel="چ" latin:keyHintLabel="۰" - latin:additionalMoreKeys="۰,0" /> + latin:additionalMoreKeys="۰,0" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml index 21548936e..4b6abe2ab 100644 --- a/java/res/xml/rowkeys_farsi2.xml +++ b/java/res/xml/rowkeys_farsi2.xml @@ -23,12 +23,14 @@ > <!-- U+0634: "ش" ARABIC LETTER SHEEN --> <Key - latin:keyLabel="ش" /> + latin:keyLabel="ش" + latin:keyLabelFlags="fontNormal" /> <!-- U+0633: "س" ARABIC LETTER SEEN U+0636: "ض" ARABIC LETTER DAD --> <Key latin:keyLabel="س" - latin:moreKeys="ض" /> + latin:moreKeys="ض" + latin:keyLabelFlags="fontNormal" /> <!-- U+06CC: "ی" ARABIC LETTER FARSI YEH U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE U+064A: "ي" ARABIC LETTER YEH @@ -36,13 +38,16 @@ U+0649: "ى" ARABIC LETTER ALEF MAKSURA --> <Key latin:keyLabel="ی" - latin:moreKeys="ئ,ي,ﯨ|ى" /> + latin:moreKeys="ئ,ي,ﯨ|ى" + latin:keyLabelFlags="fontNormal" /> <!-- U+0628: "ب" ARABIC LETTER BEH --> <Key - latin:keyLabel="ب" /> + latin:keyLabel="ب" + latin:keyLabelFlags="fontNormal" /> <!-- U+0644: "ل" ARABIC LETTER LAM --> <Key - latin:keyLabel="ل" /> + latin:keyLabel="ل" + latin:keyLabelFlags="fontNormal" /> <!-- U+0627: "ا" ARABIC LETTER ALEF U+0621: "ء" ARABIC LETTER HAMZA U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE @@ -51,22 +56,27 @@ U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW --> <Key latin:keyLabel="ا" - latin:moreKeys="ء,آ,أ,ٱ,إ" /> + latin:moreKeys="ء,آ,أ,ٱ,إ" + latin:keyLabelFlags="fontNormal" /> <!-- U+062A: "ت" ARABIC LETTER TEH U+062B: "ﺙ" ARABIC LETTER THEH U+0629: "ة": ARABIC LETTER TEH MARBUTA --> <Key latin:keyLabel="ت" - latin:moreKeys="ث,ة" /> + latin:moreKeys="ث,ة" + latin:keyLabelFlags="fontNormal" /> <!-- U+0646: "ن" ARABIC LETTER NOON --> <Key - latin:keyLabel="ن" /> + latin:keyLabel="ن" + latin:keyLabelFlags="fontNormal" /> <!-- U+0645: "م" ARABIC LETTER MEEM --> <Key - latin:keyLabel="م" /> + latin:keyLabel="م" + latin:keyLabelFlags="fontNormal" /> <!-- U+06A9: "ک" ARABIC LETTER KEHEH U+0643: "ك" ARABIC LETTER KAF --> <Key latin:keyLabel="ک" - latin:moreKeys="ك" /> + latin:moreKeys="ك" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml index 29c35134c..7d2e81f7d 100644 --- a/java/res/xml/rowkeys_farsi3.xml +++ b/java/res/xml/rowkeys_farsi3.xml @@ -25,30 +25,38 @@ U+0638: "ظ" ARABIC LETTER ZAH --> <Key latin:keyLabel="ط" - latin:moreKeys="ظ" /> + latin:moreKeys="ظ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0632: "ز" ARABIC LETTER ZAIN U+0698: "ژ" ARABIC LETTER JEH --> <Key latin:keyLabel="ز" - latin:moreKeys="ژ" /> + latin:moreKeys="ژ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0631: "ر" ARABIC LETTER REH --> <Key - latin:keyLabel="ر" /> + latin:keyLabel="ر" + latin:keyLabelFlags="fontNormal" /> <!-- U+0630: "ذ" ARABIC LETTER THAL --> <Key - latin:keyLabel="ذ" /> + latin:keyLabel="ذ" + latin:keyLabelFlags="fontNormal" /> <!-- U+062F: "د" ARABIC LETTER DAL --> <Key - latin:keyLabel="د" /> + latin:keyLabel="د" + latin:keyLabelFlags="fontNormal" /> <!-- U+067E: "پ" ARABIC LETTER PEH --> <Key - latin:keyLabel="پ" /> + latin:keyLabel="پ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0648: "و" ARABIC LETTER WAW U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE --> <Key latin:keyLabel="و" - latin:moreKeys="ؤ" /> + latin:moreKeys="ؤ" + latin:keyLabelFlags="fontNormal" /> <!-- U+06AF: "گ" ARABIC LETTER GAF --> <Key - latin:keyLabel="گ" /> + latin:keyLabel="گ" + latin:keyLabelFlags="fontNormal" /> </merge> diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml index 656ba01c4..11208045c 100644 --- a/java/res/xml/rowkeys_hindi1.xml +++ b/java/res/xml/rowkeys_hindi1.xml @@ -29,50 +29,61 @@ U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA --> <Key latin:keyLabel="औ" - latin:moreKeys="ऒं" /> + latin:moreKeys="ऒं" + latin:keyLabelFlags="fontNormal" /> <!-- U+0910: "ऐ" DEVANAGARI LETTER AI U+0910/U+0902: "ऐं" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA --> <Key latin:keyLabel="ऐ" - latin:moreKeys="ऐं" /> + latin:moreKeys="ऐं" + latin:keyLabelFlags="fontNormal" /> <!-- U+0906: "आ" DEVANAGARI LETTER AA U+0906/U+0902: "आं" DEVANAGARI LETTER AA/DEVANAGARI SIGN ANUSVARA U+0906/U+0901: "आँ" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="आ" - latin:moreKeys="आं,आँ" /> + latin:moreKeys="आं,आँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0908: "ई" DEVANAGARI LETTER II U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA --> <Key latin:keyLabel="ई" - latin:moreKeys="ईं" /> + latin:moreKeys="ईं" + latin:keyLabelFlags="fontNormal" /> <!-- U+090A: "ऊ" DEVANAGARI LETTER UU U+090A/U+0902: "ऊं" DEVANAGARI LETTER UU/DEVANAGARI SIGN ANUSVARA U+090A/U+0901: "ऊँ" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="ऊ" - latin:moreKeys="ऊं,ऊँ" /> + latin:moreKeys="ऊं,ऊँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+092D: "भ" DEVANAGARI LETTER BHA --> <Key - latin:keyLabel="भ" /> + latin:keyLabel="भ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA --> <Key - latin:keyLabel="ः" /> + latin:keyLabel="ः" + latin:keyLabelFlags="fontNormal" /> <!-- U+0918: "घ" DEVANAGARI LETTER GHA --> <Key - latin:keyLabel="घ" /> + latin:keyLabel="घ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0927: "ध" DEVANAGARI LETTER DHA U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> <Key latin:keyLabel="ध" - latin:moreKeys="क्ष,श्र" /> + latin:moreKeys="क्ष,श्र" + latin:keyLabelFlags="fontNormal" /> <!-- U+091D: "झ" DEVANAGARI LETTER JHA --> <Key - latin:keyLabel="झ" /> + latin:keyLabel="झ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA --> <Key - latin:keyLabel="ढ" /> + latin:keyLabel="ढ" + latin:keyLabelFlags="fontNormal" /> </case> <default> <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU @@ -82,7 +93,8 @@ latin:keyLabel="ौ" latin:moreKeys="ौं,%" latin:keyHintLabel="1" - latin:additionalMoreKeys="१,1" /> + latin:additionalMoreKeys="१,1" + latin:keyLabelFlags="fontNormal" /> <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA U+0968: "२" DEVANAGARI DIGIT TWO --> @@ -90,7 +102,8 @@ latin:keyLabel="ै" latin:moreKeys="ैं,%" latin:keyHintLabel="2" - latin:additionalMoreKeys="२,2" /> + latin:additionalMoreKeys="२,2" + latin:keyLabelFlags="fontNormal" /> <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU @@ -99,7 +112,8 @@ latin:keyLabel="ा" latin:moreKeys="ां,ाँ,%" latin:keyHintLabel="3" - latin:additionalMoreKeys="३,3" /> + latin:additionalMoreKeys="३,3" + latin:keyLabelFlags="fontNormal" /> <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA U+096A: "४" DEVANAGARI DIGIT FOUR --> @@ -107,7 +121,8 @@ latin:keyLabel="ी" latin:moreKeys="ीं,%" latin:keyHintLabel="4" - latin:additionalMoreKeys="४,4" /> + latin:additionalMoreKeys="४,4" + latin:keyLabelFlags="fontNormal" /> <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU @@ -116,20 +131,23 @@ latin:keyLabel="ू" latin:moreKeys="ूं,ूँ,%" latin:keyHintLabel="5" - latin:additionalMoreKeys="५,5" /> + latin:additionalMoreKeys="५,5" + latin:keyLabelFlags="fontNormal" /> <!-- U+092C: "ब" DEVANAGARI LETTER BA U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA --> <Key latin:keyLabel="ब" latin:moreKeys="ब॒,%" latin:keyHintLabel="6" - latin:additionalMoreKeys="६,6" /> + latin:additionalMoreKeys="६,6" + latin:keyLabelFlags="fontNormal" /> <!-- U+0939: "ह" DEVANAGARI LETTER HA U+096D: "७" DEVANAGARI DIGIT SEVEN --> <Key latin:keyLabel="ह" latin:keyHintLabel="7" - latin:additionalMoreKeys="७,7" /> + latin:additionalMoreKeys="७,7" + latin:keyLabelFlags="fontNormal" /> <!-- U+0917: "ग" DEVANAGARI LETTER GA U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA U+0917/U+093C: "ग़" DEVANAGARI LETTER GA/DEVANAGARI SIGN NUKTA @@ -139,13 +157,15 @@ latin:keyLabel="ग" latin:moreKeys="ज्ञ,ग़,ग॒,%" latin:keyHintLabel="8" - latin:additionalMoreKeys="८,8" /> + latin:additionalMoreKeys="८,8" + latin:keyLabelFlags="fontNormal" /> <!-- U+0926: "द" DEVANAGARI LETTER DA U+096F: "९" DEVANAGARI DIGIT NINE --> <Key latin:keyLabel="द" latin:keyHintLabel="9" - latin:additionalMoreKeys="9" /> + latin:additionalMoreKeys="9" + latin:keyLabelFlags="fontNormal" /> <!-- U+091C: "ज" DEVANAGARI LETTER JA U+091C/U+0952: "ज॒" DEVANAGARI LETTER JA/DEVANAGARI STRESS SIGN ANUDATTA U+091C/U+094D/U+091E: "ज्ञ" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA @@ -155,13 +175,15 @@ latin:keyLabel="ज" latin:moreKeys="ज॒,ज्ञ,ज़,%" latin:keyHintLabel="0" - latin:additionalMoreKeys="०,0" /> + latin:additionalMoreKeys="०,0" + latin:keyLabelFlags="fontNormal" /> <!-- U+0921: "ड" DEVANAGARI LETTER DDA U+0921/U+0952: "ड॒" DEVANAGARI LETTER DDA/DEVANAGARI STRESS SIGN ANUDATTA U+0921/U+093C: "ड़" DEVANAGARI LETTER DDA/DEVANAGARI SIGN NUKTA --> <Key latin:keyLabel="ड" - latin:moreKeys="ड॒,ड़" /> + latin:moreKeys="ड॒,ड़" + latin:keyLabelFlags="fontNormal" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml index 05e3db202..e7c67dbe7 100644 --- a/java/res/xml/rowkeys_hindi2.xml +++ b/java/res/xml/rowkeys_hindi2.xml @@ -31,7 +31,8 @@ U+0912: "ऒ" DEVANAGARI LETTER SHORT O --> <Key latin:keyLabel="ओ" - latin:moreKeys="ओं,ऑ,ऒ" /> + latin:moreKeys="ओं,ऑ,ऒ" + latin:keyLabelFlags="fontNormal" /> <!-- U+090F: "ए" DEVANAGARI LETTER E U+090F/U+0902: "एं" DEVANAGARI LETTER E/DEVANAGARI SIGN ANUSVARA U+090F/U+0901: "एँ" DEVANAGARI LETTER E/DEVANAGARI SIGN CANDRABINDU @@ -39,50 +40,60 @@ U+090E: "ऎ" DEVANAGARI LETTER SHORT E --> <Key latin:keyLabel="ए" - latin:moreKeys="एं,एँ,ऍ,ऎ" /> + latin:moreKeys="एं,एँ,ऍ,ऎ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0905: "अ" DEVANAGARI LETTER A U+0905/U+0902: "अं" DEVANAGARI LETTER A/DEVANAGARI SIGN ANUSVARA U+0905/U+0901: "अँ" DEVANAGARI LETTER A/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="अ" - latin:moreKeys="अं,अँ" /> + latin:moreKeys="अं,अँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0907: "इ" DEVANAGARI LETTER I U+0907/U+0902: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN ANUSVARA U+0907/U+0901: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="इ" - latin:moreKeys="इं,इँ" /> + latin:moreKeys="इं,इँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0909: "उ" DEVANAGARI LETTER U U+0909/U+0902: "उं" DEVANAGARI LETTER U/DEVANAGARI SIGN ANUSVARA U+0909/U+0901: "उँ" DEVANAGARI LETTER U/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="उ" - latin:moreKeys="उं,उँ" /> + latin:moreKeys="उं,उँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+092B: "फ" DEVANAGARI LETTER PHA U+092B/U+093C: "फ़" DEVANAGARI LETTER PHA/DEVANAGARI SIGN NUKTA --> <Key latin:keyLabel="फ" - latin:moreKeys="फ़" /> + latin:moreKeys="फ़" + latin:keyLabelFlags="fontNormal" /> <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA U+094D/U+0930: "्र" DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA U+0930/U+094D: "र्" DEVANAGARI LETTER RA/DEVANAGARI SIGN VIRAMA --> <Key latin:keyLabel="ऱ" - latin:moreKeys="्र,र्" /> + latin:moreKeys="्र,र्" + latin:keyLabelFlags="fontNormal" /> <!-- U+0916: "ख" DEVANAGARI LETTER KHA U+0916/U+093C: "ख़" DEVANAGARI LETTER KHA/DEVANAGARI SIGN NUKTA --> <Key latin:keyLabel="ख" - latin:moreKeys="ख़" /> + latin:moreKeys="ख़" + latin:keyLabelFlags="fontNormal" /> <!-- U+0925: "थ" DEVANAGARI LETTER THA --> <Key - latin:keyLabel="थ" /> + latin:keyLabel="थ" + latin:keyLabelFlags="fontNormal" /> <!-- U+091B: "छ" DEVANAGARI LETTER CHA --> <Key - latin:keyLabel="छ" /> + latin:keyLabel="छ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA --> <Key - latin:keyLabel="ठ" /> + latin:keyLabel="ठ" + latin:keyLabelFlags="fontNormal" /> </case> <default> <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O @@ -91,52 +102,63 @@ U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O --> <Key latin:keyLabel="ो" - latin:moreKeys="ों,ॉ,ॊ" /> + latin:moreKeys="ों,ॉ,ॊ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA --> <Key latin:keyLabel="े" - latin:moreKeys="ें" /> + latin:moreKeys="ें" + latin:keyLabelFlags="fontNormal" /> <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA --> <Key - latin:keyLabel="्" /> + latin:keyLabel="्" + latin:keyLabelFlags="fontNormal" /> <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA --> <Key latin:keyLabel="ि" - latin:moreKeys="िं" /> + latin:moreKeys="िं" + latin:keyLabelFlags="fontNormal" /> <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="ु" - latin:moreKeys="ुं,ुँ" /> + latin:moreKeys="ुं,ुँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+092A: "प" DEVANAGARI LETTER PA --> <Key - latin:keyLabel="प" /> + latin:keyLabel="प" + latin:keyLabelFlags="fontNormal" /> <!-- U+0930: "र" DEVANAGARI LETTER RA U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R U+0930/U+093C: "ऱ" DEVANAGARI LETTER RA/DEVANAGARI SIGN NUKTA U+0960: "ॠ" DEVANAGARI LETTER VOCALIC RR --> <Key latin:keyLabel="र" - latin:moreKeys="ऋ,ऱ,ॠ" /> + latin:moreKeys="ऋ,ऱ,ॠ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0915: "क" DEVANAGARI LETTER KA U+0915/U+093C: "क़" DEVANAGARI LETTER KA/DEVANAGARI SIGN NUKTA --> <Key latin:keyLabel="क" - latin:moreKeys="क़" /> + latin:moreKeys="क़" + latin:keyLabelFlags="fontNormal" /> <!-- U+0924: "त" DEVANAGARI LETTER TA U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> <Key latin:keyLabel="त" - latin:moreKeys="त्र" /> + latin:moreKeys="त्र" + latin:keyLabelFlags="fontNormal" /> <!-- U+091A: "च" DEVANAGARI LETTER CA --> <Key - latin:keyLabel="च" /> + latin:keyLabel="च" + latin:keyLabelFlags="fontNormal" /> <!-- U+091F: "ट" DEVANAGARI LETTER TTA --> <Key - latin:keyLabel="ट" /> + latin:keyLabel="ट" + latin:keyLabelFlags="fontNormal" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml index 92bcb56b3..ebbff3e33 100644 --- a/java/res/xml/rowkeys_hindi3.xml +++ b/java/res/xml/rowkeys_hindi3.xml @@ -27,15 +27,18 @@ > <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O --> <Key - latin:keyLabel="ऑ" /> + latin:keyLabel="ऑ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E--> <Key latin:keyLabel="ँ" - latin:moreKeys="ॅ" /> + latin:moreKeys="ॅ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0923: "ण" DEVANAGARI LETTER NNA --> <Key - latin:keyLabel="ण" /> + latin:keyLabel="ण" + latin:keyLabelFlags="fontNormal" /> <!-- U+0929: "ऩ" DEVANAGARI LETTER NNNA --> <Key latin:keyLabel="ऩ" /> @@ -43,65 +46,79 @@ U+0934: "ऴ" DEVANAGARI LETTER LLLA --> <Key latin:keyLabel="ळ" - latin:moreKeys="ऴ" /> + latin:moreKeys="ऴ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0936: "श" DEVANAGARI LETTER SHA --> <Key - latin:keyLabel="श" /> + latin:keyLabel="श" + latin:keyLabelFlags="fontNormal" /> <!-- U+0937: "ष" DEVANAGARI LETTER SSA --> <Key - latin:keyLabel="ष" /> + latin:keyLabel="ष" + latin:keyLabelFlags="fontNormal" /> <!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR --> <Key latin:keyLabel="ृ" - latin:moreKeys="ॄ" /> + latin:moreKeys="ॄ" + latin:keyLabelFlags="fontNormal" /> <!-- U+091E: "ञ" DEVANAGARI LETTER NYA --> <Key - latin:keyLabel="ञ" /> + latin:keyLabel="ञ" + latin:keyLabelFlags="fontNormal" /> </case> <default> <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O --> <Key - latin:keyLabel="ॉ" /> + latin:keyLabel="ॉ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA --> <Key - latin:keyLabel="ं" /> + latin:keyLabel="ं" + latin:keyLabelFlags="fontNormal" /> <!-- U+092E: "म" DEVANAGARI LETTER MA U+0950: "ॐ" DEVANAGARI OM --> <Key latin:keyLabel="म" - latin:moreKeys="ॐ" /> + latin:moreKeys="ॐ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0928: "न" DEVANAGARI LETTER NA U+091E: "ञ" DEVANAGARI LETTER NYA U+0919: "ङ" DEVANAGARI LETTER NGA U+0928/U+093C: "ऩ" DEVANAGARI LETTER NA/DEVANAGARI SIGN NUKTA --> <Key latin:keyLabel="न" - latin:moreKeys="ञ,ङ,ऩ" /> + latin:moreKeys="ञ,ङ,ऩ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0935: "व" DEVANAGARI LETTER VA --> <Key - latin:keyLabel="व" /> + latin:keyLabel="व" + latin:keyLabelFlags="fontNormal" /> <!-- U+0932: "ल" DEVANAGARI LETTER LA U+090C: "ऌ" DEVANAGARI LETTER VOCALIC L U+0961: "ॡ" DEVANAGARI LETTER VOCALIC LL --> <Key latin:keyLabel="ल" - latin:moreKeys="ऌ,ॡ" /> + latin:moreKeys="ऌ,ॡ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0938: "स" DEVANAGARI LETTER SA --> <Key - latin:keyLabel="स" /> + latin:keyLabel="स" + latin:keyLabelFlags="fontNormal" /> <!-- U+092F: "य" DEVANAGARI LETTER YA U+095F: "य़" DEVANAGARI LETTER YYA --> <Key latin:keyLabel="य" - latin:moreKeys="य़" /> + latin:moreKeys="य़" + latin:keyLabelFlags="fontNormal" /> <!-- U+093C: "़" DEVANAGARI SIGN NUKTA U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP U+0970: "॰" DEVANAGARI ABBREVIATION SIGN U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> <Key latin:keyLabel="़" - latin:moreKeys="ॽ,॰,ऽ" /> + latin:moreKeys="ॽ,॰,ऽ" + latin:keyLabelFlags="fontNormal" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml index 84d613460..e7c9b590b 100644 --- a/java/res/xml/rowkeys_qwerty1.xml +++ b/java/res/xml/rowkeys_qwerty1.xml @@ -22,11 +22,12 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="q" + latin:keyLabel="!text/keylabel_for_q" latin:keyHintLabel="1" - latin:additionalMoreKeys="1" /> + latin:additionalMoreKeys="1" + latin:moreKeys="!text/more_keys_for_q" /> <Key - latin:keyLabel="w" + latin:keyLabel="!text/keylabel_for_w" latin:keyHintLabel="2" latin:additionalMoreKeys="2" latin:moreKeys="!text/more_keys_for_w" /> @@ -46,7 +47,7 @@ latin:additionalMoreKeys="5" latin:moreKeys="!text/more_keys_for_t" /> <Key - latin:keyLabel="y" + latin:keyLabel="!text/keylabel_for_y" latin:keyHintLabel="6" latin:additionalMoreKeys="6" latin:moreKeys="!text/more_keys_for_y" /> diff --git a/java/res/xml/rowkeys_qwerty3.xml b/java/res/xml/rowkeys_qwerty3.xml index a74aeb842..b70fd729f 100644 --- a/java/res/xml/rowkeys_qwerty3.xml +++ b/java/res/xml/rowkeys_qwerty3.xml @@ -25,7 +25,8 @@ latin:keyLabel="z" latin:moreKeys="!text/more_keys_for_z" /> <Key - latin:keyLabel="x" /> + latin:keyLabel="!text/keylabel_for_x" + latin:moreKeys="!text/more_keys_for_x" /> <Key latin:keyLabel="c" latin:moreKeys="!text/more_keys_for_c" /> diff --git a/java/res/xml/rowkeys_spanish2.xml b/java/res/xml/rowkeys_spanish2.xml index 4c7e57997..335dff33c 100644 --- a/java/res/xml/rowkeys_spanish2.xml +++ b/java/res/xml/rowkeys_spanish2.xml @@ -25,5 +25,5 @@ latin:keyboardLayout="@xml/rowkeys_qwerty2" /> <!-- U+00F1: "ñ" LATIN SMALL LETTER N WITH TILDE --> <Key - latin:keyLabel="ñ" /> + latin:keyLabel="!text/keylabel_for_spanish_row2_10" /> </merge> diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml index c89716bc7..7722ca9ae 100644 --- a/java/res/xml/rowkeys_symbols3.xml +++ b/java/res/xml/rowkeys_symbols3.xml @@ -22,7 +22,7 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <Key - latin:keyLabel="!text/keylabel_for_symbols_exclamation" + latin:keyLabel="!" latin:moreKeys="!text/more_keys_for_symbols_exclamation" /> <switch> <case diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml index 4b49da171..950d2a456 100644 --- a/java/res/xml/rowkeys_thai1.xml +++ b/java/res/xml/rowkeys_thai1.xml @@ -25,100 +25,110 @@ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > - <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA --> <Key - latin:keyLabel="ฎ" /> - <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO --> + latin:keyLabel="+" /> + <!-- U+0E51: "๑" THAI DIGIT ONE --> <Key - latin:keyLabel="ฑ" /> - <!-- U+0E18: "ธ" THAI CHARACTER THO THONG --> - <Key - latin:keyLabel="ธ" /> - <!-- U+0E13: "ณ" THAI CHARACTER NO NEN --> + latin:keyLabel="๑" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E52: "๒" THAI DIGIT TWO --> <Key - latin:keyLabel="ณ" /> - <!-- U+0E0D: "ญ" THAI CHARACTER YO YING --> + latin:keyLabel="๒" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E53: "๓" THAI DIGIT THREE --> <Key - latin:keyLabel="ญ" /> - <!-- U+0E10: "ฐ" THAI CHARACTER THO THAN --> + latin:keyLabel="๓" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E54: "๔" THAI DIGIT FOUR --> <Key - latin:keyLabel="ฐ" /> - <!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT --> + latin:keyLabel="๔" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0020: " " SPACE + U+0E39: " ู" THAI CHARACTER SARA UU --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> <Key - latin:keyLabel="ฃ" /> - <!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON --> + latin:keyLabel=" ู" + latin:code="0x0E39" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT --> <Key - latin:keyLabel="ฅ" /> - <!-- U+0E51: "๑" THAI DIGIT ONE - U+0E52: "๒" THAI DIGIT TWO - U+0E53: "๓" THAI DIGIT THREE - U+0E54: "๔" THAI DIGIT FOUR - U+0E55: "๕" THAI DIGIT FIVE --> + latin:keyLabel="฿" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E55: "๕" THAI DIGIT FIVE --> <Key - latin:keyLabel="๑" - latin:moreKeys="!fixedColumnOrder!4,๒,๓,๔,๕" /> - <!-- U+0E56: "๖" THAI DIGIT SIX - U+0E57: "๗" THAI DIGIT SEVEN - U+0E58: "๘" THAI DIGIT EIGHT - U+0E59: "๙" THAI DIGIT NINE - U+0E50: "๐" THAI DIGIT ZERO --> + latin:keyLabel="๕" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E56: "๖" THAI DIGIT SIX --> <Key latin:keyLabel="๖" - latin:moreKeys="!fixedColumnOrder!4,๗,๘,๙,๐" /> + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E57: "๗" THAI DIGIT SEVEN --> + <Key + latin:keyLabel="๗" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E58: "๘" THAI DIGIT EIGHT --> + <Key + latin:keyLabel="๘" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E59: "๙" THAI DIGIT NINE --> + <Key + latin:keyLabel="๙" + latin:keyLabelFlags="fontNormal" /> </case> <default> + <!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO --> + <Key + latin:keyLabel="ๅ" + latin:keyLabelFlags="fontNormal" /> + <Key + latin:keyLabel="/" /> + <Key + latin:keyLabel="_" /> <!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO --> <Key latin:keyLabel="ภ" - latin:keyHintLabel="1" - latin:additionalMoreKeys="1,๑" /> + latin:keyLabelFlags="fontNormal" /> <!-- U+0E16: "ถ" THAI CHARACTER THO THUNG --> <Key latin:keyLabel="ถ" - latin:keyHintLabel="2" - latin:additionalMoreKeys="2,๒" /> + latin:keyLabelFlags="fontNormal" /> + <!-- U+0020: " " SPACE + U+0E38: " ุ" THAI CHARACTER SARA U --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ุ" + latin:code="0x0E38" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0020: " " SPACE + U+0E36: " ึ" THAI CHARACTER SARA UE --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ึ" + latin:code="0x0E36" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> <!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI --> <Key latin:keyLabel="ค" - latin:keyHintLabel="3" - latin:additionalMoreKeys="3,๓" /> + latin:keyLabelFlags="fontNormal" /> <!-- U+0E15: "ต" THAI CHARACTER TO TAO --> <Key latin:keyLabel="ต" - latin:keyHintLabel="4" - latin:additionalMoreKeys="4,๔" /> + latin:keyLabelFlags="fontNormal" /> <!-- U+0E08: "จ" THAI CHARACTER CHO CHAN --> <Key latin:keyLabel="จ" - latin:keyHintLabel="5" - latin:additionalMoreKeys="5,๕" /> + latin:keyLabelFlags="fontNormal" /> <!-- U+0E02: "ข" THAI CHARACTER KHO KHAI --> <Key latin:keyLabel="ข" - latin:keyHintLabel="6" - latin:additionalMoreKeys="6,๖" /> + latin:keyLabelFlags="fontNormal" /> <!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG --> <Key latin:keyLabel="ช" - latin:keyHintLabel="7" - latin:additionalMoreKeys="7,๗" /> - <!-- U+0E23: "ร" THAI CHARACTER RO RUA - U+0E25: "ล" THAI CHARACTER LO LING --> - <Key - latin:keyLabel="ร" - latin:moreKeys="ล" - latin:keyHintLabel="8" - latin:additionalMoreKeys="8,๘" /> - <!-- U+0E19: "น" THAI CHARACTER NO NU --> - <Key - latin:keyLabel="น" - latin:keyHintLabel="9" - latin:additionalMoreKeys="9,๙" /> - <!-- U+0E22: "ย" THAI CHARACTER YO YAK --> - <Key - latin:keyLabel="ย" - latin:keyHintLabel="0" - latin:additionalMoreKeys="0,๐" /> + latin:keyLabelFlags="fontNormal" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml index 80e3563f8..f602994b9 100644 --- a/java/res/xml/rowkeys_thai2.xml +++ b/java/res/xml/rowkeys_thai2.xml @@ -25,83 +25,116 @@ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > - <!-- U+0E24: "ฤ" THAI CHARACTER RU --> - <Key - latin:keyLabel="ฤ" /> - <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG --> - <Key - latin:keyLabel="ฆ" /> - <!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK --> - <Key - latin:keyLabel="ฏ" /> - <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE --> - <Key - latin:keyLabel="ฌ" /> - <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI --> - <Key - latin:keyLabel="ษ" /> - <!-- U+0E28: "ศ" THAI CHARACTER SO SALA --> - <Key - latin:keyLabel="ศ" /> - <!-- U+0E0B: "ซ" THAI CHARACTER SO SO --> - <Key - latin:keyLabel="ซ" /> - <!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT - U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO --> - <Key - latin:keyLabel="฿" - latin:moreKeys="ๅ" /> - <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK - U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI --> - <Key - latin:keyLabel="ๆ" - latin:moreKeys="ฯ" /> + <!-- U+0E50: "๐" THAI DIGIT ZERO --> + <Key + latin:keyLabel="๐" + latin:keyLabelFlags="fontNormal" /> + <Key + latin:keyLabel=""" /> + <!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA --> + <Key + latin:keyLabel="ฎ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO --> + <Key + latin:keyLabel="ฑ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E18: "ธ" THAI CHARACTER THO THONG --> + <Key + latin:keyLabel="ธ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0020: " " SPACE + U+0E4D: " ํ" THAI CHARACTER THANTHAKHAT --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ํ" + latin:code="0x0E4D" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0020: " " SPACE + U+0E4A: " ๊" THAI CHARACTER MAI TRI --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ๊" + latin:code="0x0E4A" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0E13: "ณ" THAI CHARACTER NO NEN --> + <Key + latin:keyLabel="ณ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI --> + <Key + latin:keyLabel="ฯ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E0D: "ญ" THAI CHARACTER YO YING --> + <Key + latin:keyLabel="ญ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E10: "ฐ" THAI CHARACTER THO THAN --> + <Key + latin:keyLabel="ฐ" + latin:keyLabelFlags="fontNormal" /> + <Key + latin:keyLabel="," /> </case> <default> - <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN - U+0E1E: "พ" THAI CHARACTER PHO PHAN --> - <Key - latin:keyLabel="ฟ" - latin:moreKeys="พ" /> - <!-- U+0E2B: "ห" THAI CHARACTER HO HIP --> + <!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK --> <Key - latin:keyLabel="ห" /> - <!-- U+0E01: "ก" THAI CHARACTER KO KAI --> - <Key - latin:keyLabel="ก" /> - <!-- U+0E14: "ด" THAI CHARACTER DO DEK --> - <Key - latin:keyLabel="ด" /> - <!-- U+0E2A: "ส" THAI CHARACTER SO SUA --> + latin:keyLabel="ๆ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI --> <Key - latin:keyLabel="ส" /> - <!-- U+0E27: "ว" THAI CHARACTER WO WAEN --> + latin:keyLabel="ไ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E33: "ำ" THAI CHARACTER SARA AM --> <Key - latin:keyLabel="ว" /> - <!-- U+0E07: "ง" THAI CHARACTER NGO NGU --> + latin:keyLabel="ำ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN --> <Key - latin:keyLabel="ง" /> - <!-- U+0E30: "ะ" THAI CHARACTER SARA A - U+0E32: "า" THAI CHARACTER SARA AA - U+0E33: " ำ" THAI CHARACTER SARA AM - U+0E40: "เ" THAI CHARACTER SARA E - U+0E41: "แ" THAI CHARACTER SARA AE - U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN - U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI - U+0E42: "โ" THAI CHARACTER SARA O --> + latin:keyLabel="พ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E30: "ะ" THAI CHARACTER SARA A --> <Key latin:keyLabel="ะ" - latin:moreKeys="า,ำ,เ,แ,ใ,ไ,โ" /> - <!-- U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT - U+0E34: " ิ" THAI CHARACTER SARA I - U+0E35: " ี" THAI CHARACTER SARA II - U+0E36: " ึ" THAI CHARACTER SARA UE - U+0E37: " ื" THAI CHARACTER SARA UEE - U+0E38: " ุ" THAI CHARACTER SARA U - U+0E39: " ู" THAI CHARACTER SARA UU --> - <Key - latin:keyLabel="ั" - latin:moreKeys="ิ,ี,ึ,ื,ุ,ู" /> + latin:keyLabelFlags="fontNormal" /> + <!-- U+0020: " " SPACE + U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ั" + latin:code="0x0E31" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0020: " " SPACE + U+0E35: " ี" HAI CHARACTER SARA II --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ี" + latin:code="0x0E35" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0E23: "ร" THAI CHARACTER RO RUA --> + <Key + latin:keyLabel="ร" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E19: "น" THAI CHARACTER NO NU --> + <Key + latin:keyLabel="น" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E22: "ย" THAI CHARACTER YO YAK --> + <Key + latin:keyLabel="ย" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI --> + <Key + latin:keyLabel="บ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E25: "ล" THAI CHARACTER LO LING --> + <Key + latin:keyLabel="ล" + latin:keyLabelFlags="fontNormal" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml index b8338073c..7b6e6372e 100644 --- a/java/res/xml/rowkeys_thai3.xml +++ b/java/res/xml/rowkeys_thai3.xml @@ -25,59 +25,110 @@ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" > - <!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING --> + <!-- U+0E24: "ฤ" THAI CHARACTER RU --> <Key - latin:keyLabel="ฉ" /> - <!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK --> + latin:keyLabel="ฤ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG --> <Key - latin:keyLabel="ฮ" /> - <!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO --> + latin:keyLabel="ฆ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E0F: "ฏ" THAI CHARACTER TO PATAK --> <Key - latin:keyLabel="ฒ" /> - <!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA --> + latin:keyLabel="ฏ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E42: "โ" THAI CHARACTER SARA O --> <Key - latin:keyLabel="ฬ" /> - <!-- U+0E26: "ฦ" THAI CHARACTER LU --> + latin:keyLabel="โ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE --> <Key - latin:keyLabel="ฦ" /> - <!-- U+0E4C: " ์" THAI CHARACTER THANTHAKHAT - U+0E4D: " ํ" THAI CHARACTER NIKHAHIT - U+0E3A: " ฺ" THAI CHARACTER PHINTHU --> + latin:keyLabel="ฌ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0020: " " SPACE + U+0E47: " ็" THAI CHARACTER MAITAIKHU --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> <Key - latin:keyLabel="์" - latin:moreKeys="ํ,ฺ" /> - <!-- U+0E47: " ็" THAI CHARACTER MAITAIKHU --> + latin:keyLabel=" ็" + latin:code="0x0E47" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0020: " " SPACE + U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ๋" + latin:code="0x0E4B" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0E29: "ษ" THAI CHARACTER SO RUSI --> + <Key + latin:keyLabel="ษ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E28: "ศ" THAI CHARACTER SO SALA --> + <Key + latin:keyLabel="ศ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E0B: "ซ" THAI CHARACTER SO SO --> + <Key + latin:keyLabel="ซ" + latin:keyLabelFlags="fontNormal" /> <Key - latin:keyLabel="็" /> + latin:keyLabel="." /> </case> <default> - <!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG --> + <!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN --> <Key - latin:keyLabel="ผ" /> - <!-- U+0E1B: "ป" THAI CHARACTER PO PLA - U+0E1A: "บ" THAI CHARACTER BO BAIMAI --> + latin:keyLabel="ฟ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E2B: "ห" THAI CHARACTER HO HIP --> <Key - latin:keyLabel="ป" - latin:moreKeys="บ" /> - <!-- U+0E2D: "อ" THAI CHARACTER O ANG --> + latin:keyLabel="ห" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E01: "ก" THAI CHARACTER KO KAI --> <Key - latin:keyLabel="อ" /> - <!-- U+0E17: "ท" THAI CHARACTER THO THAHAN --> + latin:keyLabel="ก" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E14: "ด" THAI CHARACTER DO DEK --> <Key - latin:keyLabel="ท" /> - <!-- U+0E21: "ม" THAI CHARACTER MO MA --> + latin:keyLabel="ด" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E40: "เ" THAI CHARACTER SARA E --> <Key - latin:keyLabel="ม" /> - <!-- U+0E1D: "ฝ" THAI CHARACTER FO FA --> + latin:keyLabel="เ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0020: " " SPACE + U+0E49: " ้" THAI CHARACTER MAI THO --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> <Key - latin:keyLabel="ฝ" /> - <!-- U+0E48: " ่" THAI CHARACTER MAI EK - U+0E49: " ้" THAI CHARACTER MAI THO - U+0E4A: " ๊" THAI CHARACTER MAI TRI - U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA --> + latin:keyLabel=" ้" + latin:code="0x0E49" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0020: " " SPACE + U+0E48: " ่" THAI CHARACTER MAI EK --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ่" + latin:code="0x0E48" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0E32: "า" THAI CHARACTER SARA AA --> + <Key + latin:keyLabel="า" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E2A: "ส" THAI CHARACTER SO SUA --> + <Key + latin:keyLabel="ส" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E27: "ว" THAI CHARACTER WO WAEN --> + <Key + latin:keyLabel="ว" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E07: "ง" THAI CHARACTER NGO NGU --> <Key - latin:keyLabel="่" - latin:moreKeys="้,๊,๋" /> + latin:keyLabel="ง" + latin:keyLabelFlags="fontNormal" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_thai4.xml b/java/res/xml/rowkeys_thai4.xml new file mode 100644 index 000000000..8a784242c --- /dev/null +++ b/java/res/xml/rowkeys_thai4.xml @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2012, 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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" + > + <Key + latin:keyLabel="(" /> + <Key + latin:keyLabel=")" /> + <!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING --> + <Key + latin:keyLabel="ฉ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK --> + <Key + latin:keyLabel="ฮ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0020: " " SPACE + U+0E3A: " ฺ" THAI CHARACTER PHINTHU --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ฺ" + latin:code="0x0E3A" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0020: " " SPACE + U+0E4C: " ์" THAI CHARACTER THANTHAKHAT --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ์" + latin:code="0x0E4C" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <Key + latin:keyLabel="\?" /> + <!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO --> + <Key + latin:keyLabel="ฒ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA --> + <Key + latin:keyLabel="ฬ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E26: "ฦ" THAI CHARACTER LU --> + <Key + latin:keyLabel="ฦ" + latin:keyLabelFlags="fontNormal" /> + </case> + <default> + <!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG --> + <Key + latin:keyLabel="ผ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E1B: "ป" THAI CHARACTER PO PLA --> + <Key + latin:keyLabel="ป" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E41: "แ" THAI CHARACTER SARA AE --> + <Key + latin:keyLabel="แ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E2D: "อ" THAI CHARACTER O ANG --> + <Key + latin:keyLabel="อ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0020: " " SPACE + U+0E34: " ิ" THAI CHARACTER SARA I --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ิ" + latin:code="0x0E34" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0020: " " SPACE + U+0E37: " ื" THAI CHARACTER SARA UEE --> + <!-- Note: The space character is needed as a preceding letter to draw some Thai + composing characters correctly. --> + <Key + latin:keyLabel=" ื" + latin:code="0x0E37" + latin:keyLabelFlags="fontNormal|followKeyLetterRatio" /> + <!-- U+0E17: "ท" THAI CHARACTER THO THAHAN --> + <Key + latin:keyLabel="ท" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E21: "ม" THAI CHARACTER MO MA --> + <Key + latin:keyLabel="ม" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN --> + <Key + latin:keyLabel="ใ" + latin:keyLabelFlags="fontNormal" /> + <!-- U+0E1D: "ฝ" THAI CHARACTER FO FA --> + <Key + latin:keyLabel="ฝ" + latin:keyLabelFlags="fontNormal" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rows_esperanto.xml b/java/res/xml/rows_esperanto.xml deleted file mode 100644 index c5f626e9b..000000000 --- a/java/res/xml/rows_esperanto.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, 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" -> - <include - latin:keyboardLayout="@xml/key_styles_common" /> - <Row - latin:keyWidth="10%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_esperanto1" /> - </Row> - <Row - latin:keyWidth="10%p" - > - <include - latin:keyboardLayout="@xml/rowkeys_esperanto2" /> - </Row> - <Row - latin:keyWidth="10%p" - > - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="15%p" - latin:visualInsetsRight="1%p" /> - <include - latin:keyboardLayout="@xml/rowkeys_esperanto3" /> - <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" - latin:visualInsetsLeft="1%p" /> - </Row> - <include - latin:keyboardLayout="@xml/row_qwerty4" /> -</merge> diff --git a/java/res/xml/rows_thai.xml b/java/res/xml/rows_thai.xml index 6b80df640..108b7e1fc 100644 --- a/java/res/xml/rows_thai.xml +++ b/java/res/xml/rows_thai.xml @@ -24,31 +24,34 @@ <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="10%p" + latin:keyWidth="8.3333%p" > <include latin:keyboardLayout="@xml/rowkeys_thai1" /> </Row> <Row - latin:keyWidth="10%p" + latin:keyWidth="8.3333%p" > <include - latin:keyboardLayout="@xml/rowkeys_thai2" - latin:keyXPos="5%p" /> + latin:keyboardLayout="@xml/rowkeys_thai2" /> </Row> <Row - latin:keyWidth="10%p" + latin:keyWidth="8.3333%p" > - <Key - latin:keyStyle="shiftKeyStyle" - latin:keyWidth="15%p" - latin:visualInsetsRight="1%p" /> <include latin:keyboardLayout="@xml/rowkeys_thai3" /> + <include + latin:keyboardLayout="@xml/key_thai_kho_khuat" /> + </Row> + <Row + latin:keyWidth="8.3333%p" + > + <Key + latin:keyStyle="shiftKeyStyle" /> + <include + latin:keyboardLayout="@xml/rowkeys_thai4" /> <Key - latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" - latin:visualInsetsLeft="1%p" /> + latin:keyStyle="deleteKeyStyle" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> |