diff options
Diffstat (limited to 'java/res/xml')
62 files changed, 1363 insertions, 890 deletions
diff --git a/java/res/xml/kbd_bengali_akkhor.xml b/java/res/xml/kbd_bengali_akkhor.xml new file mode 100644 index 000000000..6c81d5313 --- /dev/null +++ b/java/res/xml/kbd_bengali_akkhor.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <include latin:keyboardLayout="@xml/rows_bengali_akkhor" /> +</Keyboard> diff --git a/java/res/xml/kbd_serbian_qwertz.xml b/java/res/xml/kbd_serbian_qwertz.xml new file mode 100644 index 000000000..4f763b861 --- /dev/null +++ b/java/res/xml/kbd_serbian_qwertz.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <include latin:keyboardLayout="@xml/rows_serbian_qwertz" /> +</Keyboard>
\ No newline at end of file diff --git a/java/res/xml/kbd_uzbek.xml b/java/res/xml/kbd_uzbek.xml new file mode 100644 index 000000000..84486a70e --- /dev/null +++ b/java/res/xml/kbd_uzbek.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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. +*/ +--> + +<Keyboard xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <include latin:keyboardLayout="@xml/rows_uzbek" /> +</Keyboard>
\ No newline at end of file diff --git a/java/res/xml/key_period.xml b/java/res/xml/key_period.xml index fc27c0235..5b59cff19 100644 --- a/java/res/xml/key_period.xml +++ b/java/res/xml/key_period.xml @@ -23,32 +23,6 @@ > <switch> <case - latin:languageCode="hi" - latin:keyboardLayoutSet="hindi_compact" - > - <!-- U+0964: "।" DEVANAGARI DANDA --> - <Key - latin:keySpec="\u0964" - latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!autoColumnOrder!9,\\,,.,?,!,#,),(,/,;,',@,:,-,",+,\\%,&" - latin:backgroundType="functional" /> - </case> - <case - latin:languageCode="ne" - latin:keyboardLayoutSet="nepali_traditional" - > - <!-- Because the font rendering system prior to API version 16 can't automatically - render dotted circle for incomplete combining letter of some scripts, different - set of Key definitions are needed based on the API version. --> - <include - latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> - <Key - latin:keyStyle="baseKeyDevanagariSignVirama" - latin:keyLabelFlags="hasPopupHint" - latin:moreKeys="!text/morekeys_punctuation" - latin:backgroundType="functional" /> - </case> - <case latin:keyboardLayoutSet="dvorak" > <Key diff --git a/java/res/xml/key_space_5kw.xml b/java/res/xml/key_space_5kw.xml index b1fe0bbeb..692c245ff 100644 --- a/java/res/xml/key_space_5kw.xml +++ b/java/res/xml/key_space_5kw.xml @@ -22,12 +22,8 @@ xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <switch> - <!-- fa: Perisan - kn: Kannada - ne: Nepali - te: Telugu --> <case - latin:languageCode="fa|kn|ne|te" + latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu" latin:languageSwitchKeyEnabled="true" > <Key @@ -39,7 +35,7 @@ latin:keyStyle="zwnjKeyStyle" /> </case> <case - latin:languageCode="fa|kn|ne|te" + latin:keyboardLayoutSet="bengali_akkhor|farsi|kannada|nepali_romanized|nepali_traditional|telugu" latin:languageSwitchKeyEnabled="false" > <Key diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index b36ddf236..d85438d99 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -35,9 +35,6 @@ latin:keyLabelFlags="hasShiftedLetterHint" /> </default> </switch> - <!-- Base key style for the key which may have settings key as more keys. --> - <key-style - latin:styleName="baseSettingsMoreKeysStyle" /> <include latin:keyboardLayout="@xml/key_styles_settings" /> <!-- Functional key styles --> diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_styles_currency.xml index cfe9a90a1..de5e6f2f0 100644 --- a/java/res/xml/key_styles_currency.xml +++ b/java/res/xml/key_styles_currency.xml @@ -80,6 +80,7 @@ </case> <!-- fa: Persian (Rial and Afgahni) hi: Hindi (Indian Rupee) + hi_ZZ: Hinglish (Indian Rupee) iw: Hebrew (New Sheqel) lo: Lao (Kip) mn: Mongolian (Tugrik) @@ -97,8 +98,9 @@ <include latin:keyboardLayout="@xml/key_styles_currency_generic" /> </case> <!-- si_LK: Sinhala (Sri Lanka) (Sri Lanka Rupee) - ta_LK: Tamil (Sri Lanka) (Sri Lanka Rupee) --> - <case latin:countryCode="LK"> + ta_LK: Tamil (Sri Lanka) (Sri Lanka Rupee) + bn_BD: Bengali (Bangladesh) (Taka) --> + <case latin:countryCode="LK|BD"> <include latin:keyboardLayout="@xml/key_styles_currency_generic" /> </case> <!-- bn_IN: Bengali (India) (Indian Rupee) diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml index 97ae6c6c3..911c2763d 100644 --- a/java/res/xml/key_styles_number.xml +++ b/java/res/xml/key_styles_number.xml @@ -33,9 +33,7 @@ latin:keyLabelFlags="fontNormal|followKeyLetterRatio|followFunctionalTextColor" latin:parentStyle="numKeyBaseStyle" /> <key-style - latin:styleName="numFunctionalKeyStyle" - latin:keyLabelFlags="followKeyLargeLetterRatio" - latin:backgroundType="functional" + latin:styleName="numSymbolKeyStyle" latin:parentStyle="numKeyBaseStyle" /> <key-style latin:styleName="numberKeyStyle" @@ -89,11 +87,6 @@ latin:keySpec="9" latin:keyHintLabel="WXYZ" latin:parentStyle="numberKeyStyle" /> - <!-- U+FF0A: "＊" FULLWIDTH ASTERISK --> - <key-style - latin:styleName="numStarKeyStyle" - latin:keySpec="＊|*" - latin:parentStyle="numKeyStyle" /> <!-- Only for non-tablet device --> <key-style latin:styleName="numPhoneToSymbolKeyStyle" @@ -104,16 +97,6 @@ latin:keySpec="!text/keylabel_to_phone_numeric|!code/key_switch_alpha_symbol" latin:parentStyle="numModeKeyStyle" /> <key-style - latin:styleName="numPauseKeyStyle" - latin:keySpec="!text/label_pause_key|," - latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale" - latin:parentStyle="numKeyBaseStyle" /> - <key-style - latin:styleName="numWaitKeyStyle" - latin:keySpec="!text/label_wait_key|;" - latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale" - latin:parentStyle="numKeyBaseStyle" /> - <key-style latin:styleName="numTabKeyStyle" latin:keyActionFlags="noKeyPreview" latin:parentStyle="tabKeyStyle" /> diff --git a/java/res/xml/key_styles_settings.xml b/java/res/xml/key_styles_settings.xml index a504bed78..43ee601e6 100644 --- a/java/res/xml/key_styles_settings.xml +++ b/java/res/xml/key_styles_settings.xml @@ -21,16 +21,14 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <!-- Base key style for the key which may have settings key as more keys. --> - <!-- Kept as a separate file for cleaner overriding by an overlay. --> + <!-- Key style for the key which may have settings key as more keys. --> <switch> <case latin:clobberSettingsKey="true" > <key-style latin:styleName="settingsMoreKeysStyle" - latin:backgroundType="functional" - latin:parentStyle="baseSettingsMoreKeysStyle" /> + latin:backgroundType="functional" /> </case> <!-- clobberSettingsKey="false" --> <default> @@ -38,8 +36,7 @@ latin:styleName="settingsMoreKeysStyle" latin:keyLabelFlags="hasPopupHint" latin:additionalMoreKeys="!text/keyspec_settings" - latin:backgroundType="functional" - latin:parentStyle="baseSettingsMoreKeysStyle" /> + latin:backgroundType="functional" /> </default> </switch> </merge> diff --git a/java/res/xml/keyboard_layout_set_myanmar.xml b/java/res/xml/keyboard_layout_set_bengali_akkhor.xml index 5af8c064e..267064d46 100644 --- a/java/res/xml/keyboard_layout_set_myanmar.xml +++ b/java/res/xml/keyboard_layout_set_bengali_akkhor.xml @@ -18,43 +18,41 @@ */ --> -<KeyboardLayoutSet - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> - <Feature - latin:supportedScript="myanmar" /> +<KeyboardLayoutSet xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <Feature latin:supportedScript="bengali" /> <Element + latin:elementKeyboard="@xml/kbd_bengali_akkhor" latin:elementName="alphabet" - latin:elementKeyboard="@xml/kbd_myanmar" latin:enableProximityCharsCorrection="true" /> <Element + latin:elementKeyboard="@xml/kbd_bengali_akkhor" latin:elementName="alphabetAutomaticShifted" - latin:elementKeyboard="@xml/kbd_myanmar" latin:enableProximityCharsCorrection="true" /> <!-- On these shifted alphabet layouts the proximity characters correction should be disabled because the letters on these layouts aren't the ones in different case of the above - unshifted layouts. --> + unshifted layouts.--> <Element - latin:elementName="alphabetManualShifted" - latin:elementKeyboard="@xml/kbd_myanmar" /> + latin:elementKeyboard="@xml/kbd_bengali_akkhor" + latin:elementName="alphabetManualShifted" /> <Element - latin:elementName="alphabetShiftLocked" - latin:elementKeyboard="@xml/kbd_myanmar" /> + latin:elementKeyboard="@xml/kbd_bengali_akkhor" + latin:elementName="alphabetShiftLocked" /> <Element - latin:elementName="alphabetShiftLockShifted" - latin:elementKeyboard="@xml/kbd_myanmar" /> + latin:elementKeyboard="@xml/kbd_bengali_akkhor" + latin:elementName="alphabetShiftLockShifted" /> <Element - latin:elementName="symbols" - latin:elementKeyboard="@xml/kbd_symbols" /> + latin:elementKeyboard="@xml/kbd_symbols" + latin:elementName="symbols" /> <Element - latin:elementName="symbolsShifted" - latin:elementKeyboard="@xml/kbd_symbols_shift" /> + latin:elementKeyboard="@xml/kbd_symbols_shift" + latin:elementName="symbolsShifted" /> <Element - latin:elementName="phone" - latin:elementKeyboard="@xml/kbd_phone" /> + latin:elementKeyboard="@xml/kbd_phone" + latin:elementName="phone" /> <Element - latin:elementName="phoneSymbols" - latin:elementKeyboard="@xml/kbd_phone_symbols" /> + latin:elementKeyboard="@xml/kbd_phone_symbols" + latin:elementName="phoneSymbols" /> <Element - latin:elementName="number" - latin:elementKeyboard="@xml/kbd_number" /> + latin:elementKeyboard="@xml/kbd_number" + latin:elementName="number" /> </KeyboardLayoutSet> diff --git a/java/res/xml/keyboard_layout_set_nordic.xml b/java/res/xml/keyboard_layout_set_nordic.xml index 1f00f440e..eb3d45be0 100644 --- a/java/res/xml/keyboard_layout_set_nordic.xml +++ b/java/res/xml/keyboard_layout_set_nordic.xml @@ -23,7 +23,8 @@ <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_nordic" - latin:enableProximityCharsCorrection="true" /> + latin:enableProximityCharsCorrection="true" + latin:allowRedundantMoreKeys="false" /> <Element latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> diff --git a/java/res/xml/keyboard_layout_set_qwerty.xml b/java/res/xml/keyboard_layout_set_qwerty.xml index 821517081..7c9a1403e 100644 --- a/java/res/xml/keyboard_layout_set_qwerty.xml +++ b/java/res/xml/keyboard_layout_set_qwerty.xml @@ -23,7 +23,8 @@ <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_qwerty" - latin:enableProximityCharsCorrection="true" /> + latin:enableProximityCharsCorrection="true" + latin:supportsSplitLayout="true" /> <Element latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> diff --git a/java/res/xml/keyboard_layout_set_serbian_qwertz.xml b/java/res/xml/keyboard_layout_set_serbian_qwertz.xml new file mode 100644 index 000000000..2c7e28b50 --- /dev/null +++ b/java/res/xml/keyboard_layout_set_serbian_qwertz.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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:allowRedundantMoreKeys="false" + latin:elementKeyboard="@xml/kbd_serbian_qwertz" + latin:elementName="alphabet" + latin:enableProximityCharsCorrection="true" /> + <Element + latin:elementKeyboard="@xml/kbd_symbols" + latin:elementName="symbols" /> + <Element + latin:elementKeyboard="@xml/kbd_symbols_shift" + latin:elementName="symbolsShifted" /> + <Element + latin:elementKeyboard="@xml/kbd_phone" + latin:elementName="phone" /> + <Element + latin:elementKeyboard="@xml/kbd_phone_symbols" + latin:elementName="phoneSymbols" /> + <Element + latin:elementKeyboard="@xml/kbd_number" + latin:elementName="number" /> +</KeyboardLayoutSet>
\ No newline at end of file diff --git a/java/res/xml/keyboard_layout_set_swiss.xml b/java/res/xml/keyboard_layout_set_swiss.xml index e17a5ab8b..f925b83f1 100644 --- a/java/res/xml/keyboard_layout_set_swiss.xml +++ b/java/res/xml/keyboard_layout_set_swiss.xml @@ -23,7 +23,8 @@ <Element latin:elementName="alphabet" latin:elementKeyboard="@xml/kbd_swiss" - latin:enableProximityCharsCorrection="true" /> + latin:enableProximityCharsCorrection="true" + latin:allowRedundantMoreKeys="true" /> <Element latin:elementName="symbols" latin:elementKeyboard="@xml/kbd_symbols" /> diff --git a/java/res/xml/keyboard_layout_set_uzbek.xml b/java/res/xml/keyboard_layout_set_uzbek.xml new file mode 100644 index 000000000..8251b01fd --- /dev/null +++ b/java/res/xml/keyboard_layout_set_uzbek.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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_uzbek" + latin:enableProximityCharsCorrection="true" + latin:allowRedundantMoreKeys="true" /> + <Element + latin:elementKeyboard="@xml/kbd_symbols" + latin:elementName="symbols" /> + <Element + latin:elementKeyboard="@xml/kbd_symbols_shift" + latin:elementName="symbolsShifted" /> + <Element + latin:elementKeyboard="@xml/kbd_phone" + latin:elementName="phone" /> + <Element + latin:elementKeyboard="@xml/kbd_phone_symbols" + latin:elementName="phoneSymbols" /> + <Element + latin:elementKeyboard="@xml/kbd_number" + latin:elementName="number" /> +</KeyboardLayoutSet>
\ No newline at end of file diff --git a/java/res/xml/keystyle_devanagari_sign_virama.xml b/java/res/xml/keystyle_devanagari_sign_virama.xml index ff778d94c..7863ca48f 100644 --- a/java/res/xml/keystyle_devanagari_sign_virama.xml +++ b/java/res/xml/keystyle_devanagari_sign_virama.xml @@ -35,7 +35,7 @@ U+090D: "ऍ" DEVANAGARI LETTER CANDRA E --> <key-style latin:styleName="moreKeysDevanagariSignVirama" - latin:moreKeys="◌ॅ,ऍ" /> + latin:moreKeys="◌ॅ|ॅ,ऍ" /> </case> <case latin:keyboardLayoutSet="marathi"> <!-- U+0905: "अ" DEVANAGARI LETTER A --> diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 4f8efa8d6..0b0c93e84 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -28,6 +28,7 @@ be_BY: Belarusian (Belarus)/east_slavic bg: Bulgarian/bulgarian bg: Bulgarian/bulgarian_bds + bn_BD: Bengali (Bangladesh)/bengali_akkhor bn_IN: Bengali (India)/bengali ca: Catalan/spanish cs: Czech/qwertz @@ -52,6 +53,7 @@ gl_ES: Galician (Spain)/spanish hi: Hindi/hindi hi: Hindi/hindi_compact + hi_ZZ: Hinglish/qwerty # This is a preliminary keyboard layout. hr: Croatian/qwertz hu: Hungarian/qwertz hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic @@ -73,7 +75,6 @@ mn_MN: Mongolian (Mongolia)/mongolian mr_IN: Marathi (India)/marathi ms_MY: Malay (Malaysia)/qwerty - (my_MM: Myanmar (Myanmar)/myanmar) # This is a preliminary keyboard layout. nb: Norwegian Bokmål/nordic ne_NP: Nepali (Nepal) Romanized/nepali_romanized ne_NP: Nepali (Nepal) Traditional/nepali_traditional @@ -84,21 +85,22 @@ pt_PT: Portuguese (Portugal)/qwerty ro: Romanian/qwerty ru: Russian/east_slavic - (si_LK: Sinhala (Sri Lanka)/sinhala) # This is a preliminary keyboard layout. + si_LK: Sinhala (Sri Lanka)/sinhala # This is a preliminary keyboard layout. sk: Slovak/qwerty sl: Slovenian/qwerty sr: Serbian/south_slavic - (sr-Latn: Serbian/qwerty) # not yet implemented. + sr_ZZ: Serbian (Latin)/serbian_qwertz # This is a preliminary keyboard layout. sv: Swedish/nordic sw: Swahili/qwerty ta_IN: Tamil (India)/tamil - (ta_LK: Tamil (Sri Lanka)/tamil) # Disabled in conjunction with si_LK. + ta_LK: Tamil (Sri Lanka)/tamil # Disabled in conjunction with si_LK. ta_SG: Tamil (Singapore)/tamil te_IN: Telugu (India)/telugu th: Thai/thai tl: Tagalog/spanish tr: Turkish/qwerty uk: Ukrainian/east_slavic + uz_UZ: Uzbek (Uzbekistan)/uzbek # This is a preliminary keyboard layout. vi: Vietnamese/qwerty zu: Zulu/qwerty zz: QWERTY/qwerty @@ -180,6 +182,14 @@ /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" + android:subtypeId="0xa2144b0c" + android:imeSubtypeLocale="bn_BD" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali_akkhor,EmojiCapable" + android:isAsciiCapable="false" + /> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" android:subtypeId="0xbff5986c" android:imeSubtypeLocale="bn_IN" android:imeSubtypeMode="keyboard" @@ -354,6 +364,18 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi_compact,EmojiCapable" android:isAsciiCapable="false" /> + <!-- TODO: This Hinglish keyboard is a preliminary layout. + This isn't based on the final specification. --> + <!-- Disabled because there is no LM yet, and this layout does not offer anything different. + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_hi_ZZ" + android:subtypeId="0x352eb37c" + android:imeSubtypeLocale="hi_ZZ" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="AsciiCapable,KeyboardLayoutSet=qwerty,EmojiCapable" + android:isAsciiCapable="true" + /> + --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x35b7526a" @@ -524,18 +546,6 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" android:isAsciiCapable="true" /> - <!-- TODO: This Myanmar keyboard is a preliminary layout. - This isn't based on the final specification. --> - <!-- - <subtype android:icon="@drawable/ic_ime_switcher_dark" - android:label="@string/subtype_generic" - android:subtypeId="0xea266ea4" - android:imeSubtypeLocale="my_MM" - android:imeSubtypeMode="keyboard" - android:imeSubtypeExtraValue="KeyboardLayoutSet=myanmar,EmojiCapable,CombiningRules=MyanmarReordering" - android:isAsciiCapable="false" - /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x3f12ee14" @@ -618,7 +628,7 @@ /> <!-- TODO: This Sinhala keyboard is a preliminary layout. This isn't based on the final specification. --> - <!-- + <!-- si_LK is currently disabled due to lack of combination rules. <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x5c6b3bde" @@ -652,24 +662,16 @@ android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable" android:isAsciiCapable="false" /> - <!-- TODO: Uncomment once we can handle IETF language tag with script name specified. - <subtype android:icon="@drawable/ic_ime_switcher_dark" - android:label="@string/subtype_serbian_cyrillic" - android:subtypeId="0xXXXXXXXX" - android:imeSubtypeLocale="sr" - android:imeSubtypeMode="keyboard" - android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable" - android:isAsciiCapable="false" - /> + <!-- TODO: This Serbian Latin keyboard is a preliminary layout. + This isn't based on the final specification. --> <subtype android:icon="@drawable/ic_ime_switcher_dark" - android:label="@string/subtype_serbian_latin" - android:subtypeId="0xXXXXXXXX" - android:imeSubtypeLocale="sr-Latn" + android:label="@string/subtype_sr_ZZ" + android:subtypeId="0xf4a5569c" + android:imeSubtypeLocale="sr_ZZ" android:imeSubtypeMode="keyboard" - android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable" + android:imeSubtypeExtraValue="KeyboardLayoutSet=serbian_qwertz,AsciiCapable,EmojiCapable" android:isAsciiCapable="true" /> - --> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x48b4ff43" @@ -694,8 +696,8 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable" android:isAsciiCapable="false" /> - <!-- TODO: Enable ta_LK subtype when si_LK subtype is ready --> - <!-- + <!-- TODO: Enabling/Disabling ta_LK subtype must be aligned with si_LK subtype. --> + <!-- ta_LK disabled alongside si_LK subtype due to lack of combination rules. <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x6ca12d84" @@ -704,7 +706,7 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable" android:isAsciiCapable="false" /> - --> + !--> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x785abbd9" @@ -753,6 +755,16 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable" android:isAsciiCapable="false" /> + <!-- TODO: This Uzbek keyboard is a preliminary layout. + This isn't based on the final specification. --> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_generic" + android:subtypeId="0xad5cf7f6" + android:imeSubtypeLocale="uz_UZ" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="KeyboardLayoutSet=uzbek,AsciiCapable,EmojiCapable" + android:isAsciiCapable="true" + /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x93972eee" diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index c14cd645a..f01909f37 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -23,14 +23,14 @@ android:title="@string/settings_screen_preferences" android:key="screen_preferences" /> <PreferenceScreen + android:fragment="com.android.inputmethod.latin.settings.AccountsSettingsFragment" + android:title="@string/settings_screen_accounts" + android:key="screen_accounts" /> + <PreferenceScreen android:fragment="com.android.inputmethod.latin.settings.AppearanceSettingsFragment" android:title="@string/settings_screen_appearance" android:key="screen_appearance" /> <PreferenceScreen - android:fragment="com.android.inputmethod.latin.settings.MultiLingualSettingsFragment" - android:title="@string/settings_screen_multilingual" - android:key="screen_multilingual" /> - <PreferenceScreen android:fragment="com.android.inputmethod.latin.settings.GestureSettingsFragment" android:title="@string/settings_screen_gesture" android:key="screen_gesture" /> diff --git a/java/res/xml/prefs_screen_accounts.xml b/java/res/xml/prefs_screen_accounts.xml new file mode 100644 index 000000000..f2ade91e1 --- /dev/null +++ b/java/res/xml/prefs_screen_accounts.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<PreferenceScreen + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" + android:title="@string/settings_screen_accounts"> + + <!-- This preference is a dummy view of the underlying preference. + This isn't persisted and the summary/title is refreshed by the fragment + after inspecting the underlying account preference. --> + <Preference + android:key="account_switcher" + android:persistent="false" + android:title="@string/switch_accounts" + android:summary="@string/no_accounts_selected" /> + + <!-- Summary will be set programmatically to reflect the account status --> + <CheckBoxPreference + android:key="pref_enable_cloud_sync" + android:title="@string/cloud_sync_title" + android:defaultValue="false" + android:persistent="true" + android:disableDependentsState="false" /> + + <!-- This preference (acts like a button) enables the user to initiate an one time sync. --> + <Preference android:key="pref_sync_now" + android:persistent="false" + android:title="@string/sync_now_title" + android:dependency="pref_enable_cloud_sync" /> + + <!-- This preference (acts like a button) enables the user to clear data from the cloud. --> + <Preference android:key="pref_clear_sync_data" + android:persistent="false" + android:title="@string/clear_sync_data_title" + android:summary="@string/clear_sync_data_summary" + android:dependency="pref_enable_cloud_sync" /> + + <!-- Title will be set programmatically to embed application name --> + <CheckBoxPreference + android:key="pref_enable_metrics_logging" + android:summary="@string/enable_metrics_logging_summary" + android:defaultValue="true" + android:persistent="true" /> +</PreferenceScreen> diff --git a/java/res/xml/prefs_screen_advanced.xml b/java/res/xml/prefs_screen_advanced.xml index 5aefcc8d5..6038f9947 100644 --- a/java/res/xml/prefs_screen_advanced.xml +++ b/java/res/xml/prefs_screen_advanced.xml @@ -31,16 +31,16 @@ android:key="pref_keypress_sound_volume" android:title="@string/prefs_keypress_sound_volume_settings" latin:maxValue="100" /> <!-- percent --> - <!-- The settings for showing setup wizard application icon shouldn't be persistent and - the default value is added programmatically. --> - <CheckBoxPreference - android:key="pref_show_setup_wizard_icon" - android:title="@string/show_setup_wizard_icon" - android:summary="@string/show_setup_wizard_icon_summary" /> - <!-- title will be set programmatically to embed application name --> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:key="pref_key_longpress_timeout" + android:title="@string/prefs_key_longpress_timeout_settings" + latin:minValue="@integer/config_min_longpress_timeout" + latin:maxValue="@integer/config_max_longpress_timeout" + latin:stepValue="@integer/config_longpress_timeout_step" /> <CheckBoxPreference - android:key="pref_enable_metrics_logging" - android:summary="@string/enable_metrics_logging_summary" + android:key="pref_enable_emoji_alt_physical_key" + android:title="@string/prefs_enable_emoji_alt_physical_key" + android:summary="@string/prefs_enable_emoji_alt_physical_key_summary" android:defaultValue="true" android:persistent="true" /> <PreferenceScreen diff --git a/java/res/xml/prefs_screen_appearance.xml b/java/res/xml/prefs_screen_appearance.xml index 7719c058b..036b66553 100644 --- a/java/res/xml/prefs_screen_appearance.xml +++ b/java/res/xml/prefs_screen_appearance.xml @@ -26,4 +26,9 @@ android:fragment="com.android.inputmethod.latin.settings.CustomInputStyleSettingsFragment" android:key="custom_input_styles" android:title="@string/custom_input_styles_title" /> + <CheckBoxPreference + android:key="pref_split_keyboard" + android:title="@string/enable_split_keyboard" + android:persistent="true" + android:defaultValue="false" /> </PreferenceScreen> diff --git a/java/res/xml/prefs_screen_correction.xml b/java/res/xml/prefs_screen_correction.xml index dd5ba540c..a943dc1a3 100644 --- a/java/res/xml/prefs_screen_correction.xml +++ b/java/res/xml/prefs_screen_correction.xml @@ -41,13 +41,11 @@ android:summary="@string/prefs_block_potentially_offensive_summary" android:defaultValue="@bool/config_block_potentially_offensive" android:persistent="true" /> - <ListPreference - android:key="auto_correction_threshold" + <CheckBoxPreference + android:key="pref_key_auto_correction" android:title="@string/auto_correction" android:summary="@string/auto_correction_summary" - android:entryValues="@array/auto_correction_threshold_mode_indexes" - android:entries="@array/auto_correction_threshold_modes" - android:defaultValue="@string/auto_correction_threshold_mode_index_modest" + android:defaultValue="true" android:persistent="true" /> <CheckBoxPreference android:key="show_suggestions" diff --git a/java/res/xml/prefs_screen_debug.xml b/java/res/xml/prefs_screen_debug.xml index c47740268..1ae2d0e9f 100644 --- a/java/res/xml/prefs_screen_debug.xml +++ b/java/res/xml/prefs_screen_debug.xml @@ -31,13 +31,8 @@ android:defaultValue="false" android:persistent="true" /> <CheckBoxPreference - android:key="force_physical_keyboard_special_key" - android:title="@string/prefs_force_physical_keyboard_special_key" - android:defaultValue="false" - android:persistent="true" /> - <CheckBoxPreference - android:key="pref_show_ui_to_accept_typed_word" - android:title="@string/prefs_show_ui_to_accept_typed_word" + android:key="pref_should_show_lxx_suggestion_ui" + android:title="@string/prefs_should_show_lxx_suggestion_ui" android:defaultValue="true" android:persistent="true" /> <CheckBoxPreference @@ -46,12 +41,6 @@ android:summary="@string/sliding_key_input_preview_summary" android:defaultValue="true" android:persistent="true" /> - <com.android.inputmethod.latin.settings.SeekBarDialogPreference - android:key="pref_key_longpress_timeout" - android:title="@string/prefs_key_longpress_timeout_settings" - latin:minValue="@integer/config_min_longpress_timeout" - latin:maxValue="@integer/config_max_longpress_timeout" - latin:stepValue="@integer/config_longpress_timeout_step" /> <CheckBoxPreference android:key="pref_has_custom_key_preview_animation_params" android:title="@string/prefs_customize_key_preview_animation" @@ -87,9 +76,17 @@ android:key="pref_key_preview_dismiss_duration" android:title="@string/prefs_key_popup_dismiss_duration_settings" latin:maxValue="100" /> <!-- milliseconds --> - <PreferenceScreen - android:key="read_external_dictionary" - android:title="@string/prefs_read_external_dictionary" /> + <CheckBoxPreference + android:key="pref_resize_keyboard" + android:title="@string/prefs_resize_keyboard" + android:defaultValue="false" + android:persistent="true" /> + <com.android.inputmethod.latin.settings.SeekBarDialogPreference + android:dependency="pref_resize_keyboard" + android:key="pref_keyboard_height_scale" + android:title="@string/prefs_keyboard_height_scale" + latin:minValue="50" + latin:maxValue="120" /> <!-- percentage --> <PreferenceCategory android:key="pref_key_dump_dictionaries" android:title="@string/prefs_dump_dynamic_dicts"> diff --git a/java/res/xml/prefs_screen_gesture.xml b/java/res/xml/prefs_screen_gesture.xml index c87316dfa..38c7eda8e 100644 --- a/java/res/xml/prefs_screen_gesture.xml +++ b/java/res/xml/prefs_screen_gesture.xml @@ -37,11 +37,4 @@ android:title="@string/gesture_preview_trail" android:defaultValue="true" android:persistent="true" /> - <CheckBoxPreference - android:key="pref_gesture_space_aware" - android:dependency="gesture_input" - android:title="@string/gesture_space_aware" - android:summary="@string/gesture_space_aware_summary" - android:defaultValue="true" - android:persistent="true" /> </PreferenceScreen> diff --git a/java/res/xml/prefs_screen_multilingual.xml b/java/res/xml/prefs_screen_multilingual.xml deleted file mode 100644 index 07a4b701c..000000000 --- a/java/res/xml/prefs_screen_multilingual.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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. ---> - -<PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/settings_screen_multilingual" - android:key="screen_multilingual"> - <CheckBoxPreference - android:key="pref_show_language_switch_key" - android:title="@string/show_language_switch_key" - android:summary="@string/show_language_switch_key_summary" - android:defaultValue="true" - android:persistent="true" /> - <CheckBoxPreference - android:key="pref_include_other_imes_in_language_switch_list" - android:dependency="pref_show_language_switch_key" - android:title="@string/include_other_imes_in_language_switch_list" - android:summary="@string/include_other_imes_in_language_switch_list_summary" - android:defaultValue="false" - android:persistent="true" /> -</PreferenceScreen> diff --git a/java/res/xml/rowkeys_bengali_akkhor1.xml b/java/res/xml/rowkeys_bengali_akkhor1.xml new file mode 100644 index 000000000..bc612bec9 --- /dev/null +++ b/java/res/xml/rowkeys_bengali_akkhor1.xml @@ -0,0 +1,183 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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"> + <!-- U+09A2: "ঢ" BENGALI LETTER DDHA --> + <Key latin:keySpec="ঢ" /> + <!-- U+09A0: "ঠ" BENGALI LETTER TTHA --> + <Key latin:keySpec="ঠ" /> + <!-- U+09C8: "ৈ" BENGALI VOWEL SIGN AI + U+0990: "ঐ" BENGALI LETTER AI --> + <Key + latin:keySpec="ৈ" + latin:moreKeys="ঐ" /> + <!-- U+09DC: "ড়" BENGALI LETTER RRA + U+09BC: "়" BENGALI SIGN NUKTA --> + <Key + latin:keySpec="ড়" + latin:moreKeys="়" /> + <!-- U+099F: "ট" BENGALI LETTER TTA + U+09F3: "৳" BENGALI RUPEE SIGN + U+099F/U+09CD/U+099F: "ট্ট" BENGALI LETTER TTA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA + U+099F/U+09CD/U+09AC: "ট্ব" BENGALI LETTER TTA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+099F/U+09CD/U+09AE: "ট্ম" BENGALI LETTER TTA/BENGALI SIGN VIRAMA/BENGALI LETTER MA --> + <Key + latin:keySpec="ট" + latin:moreKeys="৳,ট্ট,ট্ব,ট্ম" /> + <!-- U+099E: "ঞ" BENGALI LETTER NYA + U+099E/U+09CD/U+099A: "ঞ্চ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER CA + U+099E/U+09CD/U+099B: "ঞ্ছ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER CHA + U+099E/U+09CD/U+099C: "ঞ্জ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER JA --> + <Key + latin:keySpec="ঞ" + latin:moreKeys="ঞ্চ,ঞ্ছ,ঞ্জ" /> + <!-- U+09C2: "ূ" BENGALI VOWEL SIGN UU + U+098A: "ঊ" BENGALI LETTER UU --> + <Key + latin:keySpec="ূ" + latin:moreKeys="ঊ" /> + <!-- U+09C0: "ী" BENGALI VOWEL SIGN II + U+0988: "ঈ" BENGALI LETTER II --> + <Key + latin:keySpec="ী" + latin:moreKeys="ঈ" /> + <!-- U+09CC: "ৌ" BENGALI VOWEL SIGN AU + U+099A: "ঔ" BENGALI LETTER CA + U+09D7: "ৗ" BENGALI AU LENGTH MARK --> + <Key + latin:keySpec="ৌ" + latin:moreKeys="চ,ৗ" /> + <!-- U+09AB: "ফ" BENGALI LETTER PHA + U+09AB/U+09CD/U+099F: "ফ্ট" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA + U+09AB/U+09CD/U+09AF: "ফ্য" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER YA + U+09AB/U+09CD/U+09B0: "ফ্র" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA + U+09AB/U+09CD/U+09B2: "ফ্ল" BENGALI LETTER PHA/BENGALI SIGN VIRAMA/BENGALI LETTER LA --> + <Key + latin:keySpec="ফ" + latin:moreKeys="ফ্ট,ফ্য,ফ্র,ফ্ল" /> + <!-- U+098B: "ঋ" BENGALI LETTER VOCALIC R + U+098C: "ঌ" BENGALI LETTER VOCALIC L + U+09E1: "ৡ" BENGALI LETTER VOCALIC LL + U+09F4: "৴" BENGALI CURRENCY NUMERATOR ONE + U+09F5: "৵" BENGALI CURRENCY NUMERATOR TWO + U+09F6: "৶" BENGALI CURRENCY NUMERATOR THREE + U+09E2: " ৢ" BENGALI VOWEL SIGN VOCALIC L + U+09E3: " ৣ" BENGALI VOWEL SIGN VOCALIC LL --> + <Key + latin:keySpec="ঋ" + latin:moreKeys="ঌ,ৡ,৴,৵,৶,ৢ,ৣ" /> + </case> + <default> + <!-- U+09A7: "ধ" BENGALI LETTER DHA + U+09E7: "১" BENGALI DIGIT ONE + U+09A7/U+09CD/U+09AC: "ধ্ব্র" BENGALI LETTER DHA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09A7/U+09CD/U+09AF: "ধ্য্র" BENGALI LETTER DHA/BENGALI SIGN VIRAMA/BENGALI LETTER YA + U+09A7/U+09CD/U+09B0: "ধ্র" BENGALI LETTER DHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA --> + <Key + latin:keySpec="ধ" + latin:keyHintLabel="১" + latin:additionalMoreKeys="১" + latin:moreKeys="ধ্ব,ধ্য,ধ্র" /> + <!-- U+09A5: "থ" BENGALI LETTER THA + U+09E8: "২" BENGALI DIGIT TWO + U+09A5/U+09CD/U+09AF: "থ্য" BENGALI LETTER THA/BENGALI SIGN VIRAMA/BENGALI LETTER YA + U+09A5/U+09CD/U+09B0: "থ্র" BENGALI LETTER THA/BENGALI SIGN VIRAMA/BENGALI LETTER RA --> + <Key + latin:keySpec="থ" + latin:keyHintLabel="২" + latin:additionalMoreKeys="২" + latin:moreKeys="থ্য,থ্র" /> + <!-- U+09C7: "ে" BENGALI VOWEL SIGN E + U+09E9: "৩" BENGALI DIGIT THREE + U+098F: "এ" BENGALI LETTER E --> + <Key + latin:keySpec="ে" + latin:keyHintLabel="৩" + latin:additionalMoreKeys="৩" + latin:moreKeys="এ" /> + <!-- U+09B0: "র" BENGALI LETTER RA + U+09EA: "৪" BENGALI DIGIT FOUR --> + <Key + latin:keySpec="র" + latin:keyHintLabel="৪" + latin:additionalMoreKeys="৪" /> + <!-- U+09A4: "ত" BENGALI LETTER TA + U+09EB: "৫" BENGALI DIGIT FIVE + U+09CE: "ৎ" BENGALI LETTER KHANDA TA + U+09A4/U+09CD/U+09A4: "ত্ত" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER TA + U+09A4/U+09CD/U+09A8: "ত্ন" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER NA + U+09A4/U+09CD/U+09AC: "ত্ব" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09A4/U+09CD/U+09AE: "ত্ম" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER MA --> + <Key + latin:keySpec="ত" + latin:keyHintLabel="৫" + latin:additionalMoreKeys="৫" + latin:moreKeys="ৎ,ত্ত,ত্ন,ত্ব,ত্ম" /> + <!-- U+09DF: "য়" BENGALI LETTER YYA + U+09EC: "৬" BENGALI DIGIT SIX --> + <Key + latin:keySpec="য়" + latin:keyHintLabel="৬" + latin:additionalMoreKeys="৬" /> + <!-- U+09C1: "ু" BENGALI VOWEL SIGN U + U+09ED: "৭" BENGALI DIGIT SEVEN + U+0989: "উ" BENGALI LETTER U --> + <Key + latin:keySpec="ু" + latin:keyHintLabel="৭" + latin:additionalMoreKeys="৭" + latin:moreKeys="উ" /> + <!-- U+09BF: "ি" BENGALI VOWEL SIGN I + U+09EE: "৮" BENGALI DIGIT EIGHT + U+0987: "ই BENGALI LETTER I --> + <Key + latin:keySpec="ি" + latin:keyHintLabel="৮" + latin:additionalMoreKeys="৮" + latin:moreKeys="ই" /> + <!-- U+09CB: "ো" BENGALI VOWEL SIGN O + U+09EF: "৯" BENGALI DIGIT NINE + U+0993: "ও" BENGALI LETTER O --> + <Key + latin:keySpec="ো" + latin:keyHintLabel="৯" + latin:additionalMoreKeys="৯" + latin:moreKeys="ও" /> + <!-- U+09AA: "প" BENGALI LETTER PA + U+09E6: "০" BENGALI DIGIT ZERO + U+09AA/U+09CD/U+09A4: "প্ত" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER TA + U+09AA/U+09CD/U+09A8: "প্ন" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER NA + U+09AA/U+09CD/U+09AA: "প্প" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER PA + U+09AA/U+09CD/U+09AF: "প্য" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER YA + U+09AA/U+09CD/U+09B0: "প্র" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER RA + U+09AA/U+09CD/U+09B2: "প্ল" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER LA + U+09AA/U+09CD/U+09B8: "প্স" BENGALI LETTER PA/BENGALI SIGN VIRAMA/BENGALI LETTER SA --> + <Key + latin:keySpec="প" + latin:keyHintLabel="০" + latin:additionalMoreKeys="০" + latin:moreKeys="প্ত,প্ন,প্প,প্য,প্র,প্ল,প্স" /> + <!-- U+0986: "আ" BENGALI LETTER AA --> + <Key latin:keySpec="আ" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_bengali_akkhor2.xml b/java/res/xml/rowkeys_bengali_akkhor2.xml new file mode 100644 index 000000000..1dbab5560 --- /dev/null +++ b/java/res/xml/rowkeys_bengali_akkhor2.xml @@ -0,0 +1,152 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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"> + <!-- U+0985: "অ" BENGALI LETTER A --> + <Key latin:keySpec="অ" /> + <!-- U+09B6: "শ" BENGALI LETTER SHA + U+09B6/U+09CD/U+099A: "শ্চ" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER CA + U+09B6/U+09CD/U+099B: "শ্ছ" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER CHA + U+09B6/U+09CD/U+09A4: "শ্ত" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER TA + U+09B6/U+09CD/U+09A8: "শ্ন" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER NA + U+09B6/U+09CD/U+09AC: "শ্ব" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09B6/U+09CD/U+09AE: "শ্ম" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER MA + U+09B6/U+09CD/U+09B0: "শ্র" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA + U+09B6/U+09CD/U+09B2: "শ্ল" BENGALI LETTER SHA/BENGALI SIGN VIRAMA/BENGALI LETTER LA --> + <Key + latin:keySpec="শ" + latin:moreKeys="শ্চ,শ্ছ,শ্ত,শ্ন,শ্ব,শ্ম,শ্র,শ্ল" /> + <!-- U+09A1: "ড" BENGALI LETTER DDA + U+09A1/U+09CD/U+09A1: "ড্ড" BENGALI LETTER DDA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA--> + <Key + latin:keySpec="ড" + latin:moreKeys="ড্ড" /> + <!-- U+09DD: "ঢ়" BENGALI LETTER RHA --> + <Key latin:keySpec="ঢ়" /> + <!-- U+0998: "ঘ" BENGALI LETTER GHA --> + <Key latin:keySpec="ঘ" /> + <!-- U+09B9: "হ" BENGALI LETTER HA + U+09BD: "ঽ" BENGALI SIGN AVAGRAHA + U+09B9/U+09CD/U+09A3: "হ্ণ" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER NNA + U+09B9/U+09CD/U+09A8: "হ্ন" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER NA + U+09B9/U+09CD/U+09AC: "হ্ব" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09B9/U+09CD/U+09AE: "হ্ম" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER MA + U+09B9/U+09CD/U+09B0: "হ্র" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER RA + U+09B9/U+09CD/U+09B2: "হ্ল" BENGALI LETTER HA/BENGALI SIGN VIRAMA/BENGALI LETTER LA --> + <Key + latin:keySpec="হ" + latin:moreKeys="ঽ,হ্ণ,হ্ন,হ্ব,হ্ম,হ্র,হ্ল" /> + <!-- U+099D: "ঝ" BENGALI LETTER JHA --> + <Key latin:keySpec="ঝ" /> + <!-- U+0996: "খ" BENGALI LETTER KHA --> + <Key latin:keySpec="খ" /> + <!-- U+09CE: "ৎ" BENGALI LETTER KHANDA TA --> + <Key latin:keySpec="ৎ" /> + <!-- U+0988: "ঈ" BENGALI LETTER II --> + <Key latin:keySpec="ঈ" /> + <!-- U+098A: "ঊ" BENGALI LETTER UU --> + <Key latin:keySpec="ঊ" /> + </case> + <default> + <!-- U+09BE: "া BENGALI VOWEL SIGN AA + U+0986: "আ" BENGALI LETTER AA --> + <Key + latin:keySpec="া" + latin:moreKeys="আ" /> + <!-- U+09B8: "স" BENGALI LETTER SA + U+09B8/U+09CD/U+09AC: "স্ব" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09B8/U+09CD/U+09A4: "স্ত" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER TA + U+09B8/U+09CD/U+099F: "স্ট" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA + U+09B8/U+09CD/U+0995: "স্ক" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER KA + U+09B8/U+09CD/U+09AA: "স্প" BENGALI LETTER SA/BENGALI SIGN VIRAMA/BENGALI LETTER PA --> + <Key + latin:keySpec="স" + latin:moreKeys="স্ব,স্ত,স্ট,স্ক,স্প" /> + <!-- U+09A6: "দ" BENGALI LETTER DA + U+09A6/U+09CD/U+09A6: "দ্দ" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER DA + U+09A6/U+09CD/U+09A7: "দ্ধ" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA + U+09A6/U+09CD/U+09AC: "দ্ব" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09A6/U+09CD/U+09AD: "দ্ভ" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER BHA + U+09A6/U+09CD/U+09AE: "দ্ম" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER MA + U+09A6/U+09CD/U+09AF: "দ্য" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER YA + U+09A6/U+09CD/U+09B0: "দ্র" BENGALI LETTER DA/BENGALI SIGN VIRAMA/BENGALI LETTER RA --> + <Key + latin:keySpec="দ" + latin:moreKeys="দ্দ,দ্ধ,দ্ব,দ্ভ,দ্ম,দ্য,দ্র" /> + <!-- U+09C3: "ৃ" BENGALI VOWEL SIGN VOCALIC R + U+098B: "ঋ" BENGALI LETTER VOCALIC R --> + <Key + latin:keySpec="ৃ" + latin:moreKeys="ঋ" /> + <!-- U+0997: "গ" BENGALI LETTER GA + U+0997/U+09CD/U+09A7: "গ্ধ" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA + U+0997/U+09CD/U+09B0: "গ্র" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER RA + U+0997/U+09CD/U+09B2: "গ্ল" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER LA + U+0997/U+09CD/U+09A8: "গ্ন" BENGALI LETTER GA/BENGALI SIGN VIRAMA/BENGALI LETTER NA --> + <Key + latin:keySpec="গ" + latin:moreKeys="গ্ধ,গ্র,গ্ল,গ্ন" /> + <!-- U+09CD: "্" BENGALI SIGN VIRAMA --> + <Key latin:keySpec="্" /> + <!-- U+099C: "জ" BENGALI LETTER JA + U+099C/U+09CD/U+099E: "জ্ঞ" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER NYA + U+099C/U+09CD/U+099C: "জ্জ" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER JA + U+099C/U+09CD/U+09AF: "জ্ব" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER YA + U+099C/U+09CD/U+09AC: "জ্য" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+099C/U+09CD/U+09B0: "জ্র" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER RA --> + <Key + latin:keySpec="জ" + latin:moreKeys="জ্ঞ,জ্জ,জ্য,জ্ব,জ্র" /> + <!-- U+0995: "ক" BENGALI LETTER KA + U+0995/U+09CD/U+09B7: "ক্ষ" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SSA + U+0995/U+09CD/U+0995: "ক্ক" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER KA + U+0995/U+09CD/U+099F: "ক্ট" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA + U+0995/U+09CD/U+09A4: "ক্ত" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER TA + U+0995/U+09CD/U+09B0: "ক্র" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER RA + U+0995/U+09CD/U+09B8: "ক্স" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SA + U+0995/U+09CD/U+09B2: "ক্ল" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER LA --> + <Key + latin:keySpec="ক" + latin:moreKeys="ক্ষ,ক্ক,ক্ট,ক্ত,ক্র,ক্স,ক্ল" /> + <!-- U+09B2: "ল" BENGALI LETTER LA + U+09B2/U+09CD/U+0995: "ল্ক" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER KA + U+09B2/U+09CD/U+0997: "ল্গ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER GA + U+09B2/U+09CD/U+099F: "ল্ট" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA + U+09B2/U+09CD/U+09A1: "ল্ড" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA + U+09B2/U+09CD/U+09A4: "ল্ত" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER TA + U+09B2/U+09CD/U+09A6: "ল্দ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER DA + U+09B2/U+09CD/U+09A7: "ল্ধ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA + U+09B2/U+09CD/U+09AA: "ল্প" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER PA + U+09B2/U+09CD/U+09AB: "ল্ফ" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER PHA + U+09B2/U+09CD/U+09AC: "ল্ব" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09B2/U+09CD/U+09AE: "ল্ম" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER MA + U+09B2/U+09CD/U+09B2: "ল্ল" BENGALI LETTER LA/BENGALI SIGN VIRAMA/BENGALI LETTER LA --> + <Key + latin:keySpec="ল" + latin:moreKeys="ল্ক,ল্গ,ল্ট,ল্ড,ল্ত,ল্দ,ল্ধ,ল্প,ল্ফ,ল্ব,ল্ম,ল্ল" /> + <!-- U+0987: "ই" BENGALI LETTER I --> + <Key latin:keySpec="ই" /> + <!-- U+0989: "উ" BENGALI LETTER U --> + <Key latin:keySpec="উ" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_bengali_akkhor3.xml b/java/res/xml/rowkeys_bengali_akkhor3.xml new file mode 100644 index 000000000..eb9e8362f --- /dev/null +++ b/java/res/xml/rowkeys_bengali_akkhor3.xml @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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"> + <!-- U+0964: "।" DEVANAGARI DANDA + U+0965: "॥" DEVANAGARI DOUBLE DANDA --> + <Key + latin:keySpec="।" + latin:moreKeys="॥" /> + <!-- U+0999: "ঙ BENGALI LETTER NGA + U+0999/U+09CD/U+0995: "ঙ্ক" + U+0999/U+09CD/U+0996: "ঙ্খ" + U+0999/U+09CD/U+0997: "ঙ্গ" --> + <Key latin:keySpec="ঙ" + latin:moreKeys="ঙ্ক,ঙ্খ,ঙ্গ" /> + <!-- U+099B: "ছ" BENGALI LETTER CHA --> + <Key latin:keySpec="ছ" /> + <!-- U+0983: "ঃ" BENGALI SIGN VISARGA --> + <Key latin:keySpec="ঃ" /> + <!-- U+0981: "ঁ" BENGALI SIGN CANDRABINDU --> + <Key latin:keySpec="ঁ" /> + <!-- U+09A3: "ণ" BENGALI LETTER NNA + U+09A3/U+09CD/U+099F: "ণ্ট" BENGALI LETTER NNA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA + U+09A3/U+09CD/U+09A1: "ণ্ড" BENGALI LETTER NNA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA + U+09A3/U+09CD/U+09A3: "ণ্ণ" BENGALI LETTER NNA/BENGALI SIGN VIRAMA/BENGALI LETTER NNA --> + <Key latin:keySpec="ণ" + latin:moreKeys="ণ্ট,ণ্ড,ণ্ণ" /> + <!-- U+0982: "ং" BENGALI SIGN ANUSVARA --> + <Key latin:keySpec="ং" /> + <!-- U+0990: "ঐ" BENGALI LETTER AI --> + <Key latin:keySpec="ঐ" /> + <!-- U+0994: "ঔ" BENGALI LETTER AU --> + <Key latin:keySpec="ঔ" /> + </case> + <default> + <!-- U+09AF: "য" BENGALI LETTER YA + U+09CD/U+09AF: "্য" BENGALI SIGN VIRAMA/BENGALI LETTER YA --> + <Key + latin:keySpec="য" + latin:moreKeys="্য" /> + <!-- U+09B7: "ষ" BENGALI LETTER SSA + U+09B7/U+09CD/U+0995: "ষ্ক" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER KA + U+09B7/U+09CD/U+099F: "ষ্ট" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA + U+09B7/U+09CD/U+09A0: "ষ্ঠ" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER TTHA + U+09B7/U+09CD/U+09A3: "ষ্ণ" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER NNA + U+09B7/U+09CD/U+09AA: "ষ্প" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER PA + U+09B7/U+09CD/U+09AB: "ষ্ফ" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER PHA + U+09B7/U+09CD/U+09AE: "ষ্ম" BENGALI LETTER SSA/BENGALI SIGN VIRAMA/BENGALI LETTER MA --> + <Key + latin:keySpec="ষ" + latin:moreKeys="ষ্ক,ষ্ট,ষ্ঠ,ষ্ণ,ষ্প,ষ্ফ,ষ্ম" /> + <!-- U+099A: "চ" BENGALI LETTER CA + U+099A/U+09CD/U+099A: "চ্চ" BENGALI LETTER CA/BENGALI SIGN VIRAMA/BENGALI LETTER CA + U+099A/U+09CD/U+099B: "চ্ছ" BENGALI LETTER CA/BENGALI SIGN VIRAMA/BENGALI LETTER CHA --> + <Key + latin:keySpec="চ" + latin:moreKeys="চ্চ,চ্ছ" /> + <!-- U+09AD: "ভ" BENGALI LETTER BHA + U+09AD/U+09CD/U+09AF: "ভ্" BENGALI LETTER BHA/BENGALI SIGN VIRAMA/BENGALI LETTER YA + U+09AD/U+09CD/U+09B0: "ভ্র" BENGALI LETTER BHA/BENGALI SIGN VIRAMA/BENGALI LETTER RA + U+09AD/U+09CD/U+09B2: "ভ্ল" BENGALI LETTER BHA/BENGALI SIGN VIRAMA/BENGALI LETTER LA --> + <Key + latin:keySpec="ভ" + latin:moreKeys="ভ্য,ভ্র,ভ্ল" /> + <!-- U+09AC: "ব" BENGALI LETTER BA + U+09CD/U+09AC: "্ব" BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09AC/U+09CD/U+09B0: "ব্র" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER RA + U+09AC/U+09CD/U+099C: "ব্জ" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER JA + U+09AC/U+09CD/U+09A6: "ব্দ" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER DA + U+09AC/U+09CD/U+09A7: "ব্ধ" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA + U+09AC/U+09CD/U+09AC: "ব্ব" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09AC/U+09CD/U+09B2: "ব্ল" BENGALI LETTER BA/BENGALI SIGN VIRAMA/BENGALI LETTER LA + U+09F1: "ৱ" BENGALI LETTER RA WITH MIDDLE DIAGONAL + U+09F0: "ৰ" BENGALI LETTER RA WITH LOWER DIAGONAL --> + <Key + latin:keySpec="ব" + latin:moreKeys="্ব,ব্র,ব্জ,ব্দ,ব্ধ,ব্ব,ব্ল,ৱ,ৰ" /> + <!-- U+09A8: "ন" BENGALI LETTER NA + U+09A8/U+09CD/U+09A4: "ন্ত" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER TA + U+09A8/U+09CD/U+09A5: "ন্থ" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER THA + U+09A8/U+09CD/U+099F: "ন্ট" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER TTA + U+09A8/U+09CD/U+09A6: "ন্দ" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER DA + U+09A8/U+09CD/U+09A7: "ন্ধ" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER DHA + U+09A8/U+09CD/U+09A1: "ন্ড" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER DDA + U+09A8/U+09CD/U+09A8: "ন্ন" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER NA + U+09A8/U+09CD/U+09AC: "ন্ব" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09A8/U+09CD/U+09AE: "ন্ম" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER MA + U+09A8/U+09CD/U+09B8: "ন্স" BENGALI LETTER NA/BENGALI SIGN VIRAMA/BENGALI LETTER SA --> + <Key + latin:keySpec="ন" + latin:moreKeys="ন্ত,ন্থ,ন্ট,ন্দ,ন্ধ,ন্ড,ন্ন,ন্ব,ন্ম,ন্স" /> + <!-- U+09AE: "ম" BENGALI LETTER MA + U+09AE/U+09CD/U+09A8: "ম্ন" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER NA + U+09AE/U+09CD/U+09AA: "ম্প" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER PA + U+09AE/U+09CD/U+09AC: "ম্ব" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER BA + U+09AE/U+09CD/U+09AD: "ম্ভ" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER BHA + U+09AE/U+09CD/U+09AE: "ম্ম" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER MA + U+09AE/U+09CD/U+09B0: "ম্র" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER RA + U+09AE/U+09CD/U+09B2: "ম্ল" BENGALI LETTER MA/BENGALI SIGN VIRAMA/BENGALI LETTER LA --> + <Key + latin:keySpec="ম" + latin:moreKeys=",ম্ন,ম্প,ম্ব,ম্ভ,ম্ম,ম্র,ম্ল" /> + <!-- U+098F: "এ" BENGALI LETTER E --> + <Key latin:keySpec="এ" /> + <!-- U+0993: "ও" BENGALI LETTER O --> + <Key latin:keySpec="ও" /> + </default> + </switch> +</merge> diff --git a/java/res/xml/rowkeys_myanmar1.xml b/java/res/xml/rowkeys_myanmar1.xml deleted file mode 100644 index 117007431..000000000 --- a/java/res/xml/rowkeys_myanmar1.xml +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2014, 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"> - <!-- U+1027: "ဧ" MYANMAR LETTER E --> - <Key latin:keySpec="ဧ" /> - <!-- U+104F: "၏" MYANMAR SYMBOL GENITIVE --> - <Key latin:keySpec="၏" /> - <!-- U+1024: "ဤ" MYANMAR LETTER II --> - <Key latin:keySpec="ဤ" /> - <!-- U+1023: "ဣ" MYANMAR LETTER I --> - <Key latin:keySpec="ဣ" /> - <!-- U+104E: "၎" MYANMAR SYMBOL AFOREMENTIONED --> - <Key latin:keySpec="၎" /> - <!-- U+1000/U+103B/U+1015/U+103A: "ကျပ်" - MYANMAR LETTER KA/MYANMAR CONSONANT SIGN MEDIAL YA/MYANMAR LETTER PA/MYANMAR SIGN ASAT --> - <Key - latin:keySpec="ကျပ်" - latin:keyLabelFlags="followKeyLetterRatio|autoScale" /> - <!-- U+1029: "ဩ" MYANMAR LETTER O --> - <Key - latin:keySpec="ဩ" - latin:keyLabelFlags="autoScale" /> - <!-- U+102A: "ဪ" MYANMAR LETTER AU --> - <Key - latin:keySpec="ဪ" - latin:keyLabelFlags="autoScale" /> - <!-- U+104D: "၍" MYANMAR SYMBOL COMPLETED --> - <Key latin:keySpec="၍" /> - <!-- U+104C: "၌" MYANMAR SYMBOL LOCATIVE --> - <Key latin:keySpec="၌" /> - </case> - <default> - <!-- U+1041: "၁" MYANMAR DIGIT ONE --> - <Key - latin:keySpec="၁" - latin:keyHintLabel="1" - latin:additionalMoreKeys="1" /> - <!-- U+1042: "၂" MYANMAR DIGIT TWO --> - <Key - latin:keySpec="၂" - latin:keyHintLabel="2" - latin:additionalMoreKeys="2" /> - <!-- U+1043: "၃" MYANMAR DIGIT THREE --> - <Key - latin:keySpec="၃" - latin:keyHintLabel="3" - latin:additionalMoreKeys="3" /> - <!-- U+1044: "၄" MYANMAR DIGIT FOUR --> - <Key - latin:keySpec="၄" - latin:keyHintLabel="4" - latin:additionalMoreKeys="4" /> - <!-- U+1045: "၅" MYANMAR DIGIT FIVE --> - <Key - latin:keySpec="၅" - latin:keyHintLabel="5" - latin:additionalMoreKeys="5" /> - <!-- U+1046: "၆" MYANMAR DIGIT SIX --> - <Key - latin:keySpec="၆" - latin:keyHintLabel="6" - latin:additionalMoreKeys="6" /> - <!-- U+1047: "၇" MYANMAR DIGIT SEVEN --> - <Key - latin:keySpec="၇" - latin:keyHintLabel="7" - latin:additionalMoreKeys="7" /> - <!-- U+1048: "၈" MYANMAR DIGIT EIGHT --> - <Key - latin:keySpec="၈" - latin:keyHintLabel="8" - latin:additionalMoreKeys="8" /> - <!-- U+1049: "၉" MYANMAR DIGIT NINE --> - <Key - latin:keySpec="၉" - latin:keyHintLabel="9" - latin:additionalMoreKeys="9" /> - <!-- U+1040: "၀" MYANMAR DIGIT ZERO --> - <Key - latin:keySpec="၀" - latin:keyHintLabel="0" - latin:additionalMoreKeys="0" /> - </default> - </switch> -</merge> diff --git a/java/res/xml/rowkeys_myanmar2.xml b/java/res/xml/rowkeys_myanmar2.xml deleted file mode 100644 index ae71ecbde..000000000 --- a/java/res/xml/rowkeys_myanmar2.xml +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2014, 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"> - <!-- U+1017: "ဗ" MYANMAR LETTER BA - U+1039/U+1017: "္ဗ" MYANMAR SIGN VIRAMA/MYANMAR LETTER BA --> - <Key - latin:keySpec="ဗ" - latin:moreKeys="္ဗ" /> - <!-- U+1012: "ဒ" MYANMAR LETTER DA - U+1039/U+1012: "္ဒ" MYANMAR SIGN VIRAMA/MYANMAR LETTER DA --> - <Key - latin:keySpec="ဒ" - latin:moreKeys="္ဒ" /> - <!-- U+1013: "ဓ" MYANMAR LETTER DHA - U+1039/U+1013: "္ဓ" MYANMAR SIGN VIRAMA/MYANMAR LETTER DHA --> - <Key - latin:keySpec="ဓ" - latin:moreKeys="္ဓ" /> - <!-- U+1003: "ဃ" MYANMAR LETTER GHA --> - <Key latin:keySpec="ဃ" /> - <!-- U+100E: "ဎ" MYANMAR LETTER DDHA --> - <Key latin:keySpec="ဎ" /> - <!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA --> - <Key latin:keySpec="ဿ" /> - <!-- U+100F: "ဏ" MYANMAR LETTER NNA --> - <Key latin:keySpec="ဏ" /> - <!-- U+1008: "ဈ" MYANMAR LETTER JHA - U+1039/U+1008: "္ဈ" MYANMAR SIGN VIRAMA/MYANMAR LETTER JHA --> - <Key - latin:keySpec="ဈ" - latin:moreKeys="္ဈ" /> - <!-- U+1007: "ဇ" MYANMAR LETTER JA - U+1039/U+1007: "္ဇ" MYANMAR SIGN VIRAMA/MYANMAR LETTER JA --> - <Key - latin:keySpec="ဇ" - latin:moreKeys="္ဇ" /> - <!-- U+1002: "ဂ" MYANMAR LETTER GA - U+1039/U+1002: "္ဂ" MYANMAR SIGN VIRAMA/MYANMAR LETTER GA --> - <Key - latin:keySpec="ဂ" - latin:moreKeys="္ဂ" /> - </case> - <default> - <!-- U+1006: "ဆ" MYANMAR LETTER CHA - U+1039/U+1006: "္ဆ" MYANMAR SIGN VIRAMA/MYANMAR LETTER CHA --> - <Key - latin:keySpec="ဆ" - latin:moreKeys="္ဆ" /> - <!-- U+1010: "တ" MYANMAR LETTER TA - U+1039/U+1010: "္တ" MYANMAR SIGN VIRAMA/MYANMAR LETTER TA --> - <Key - latin:keySpec="တ" - latin:moreKeys="္တ" /> - <!-- U+1014: "န" MYANMAR LETTER NA - U+1039/U+1014: "္န" MYANMAR SIGN VIRAMA/MYANMAR LETTER NA --> - <Key - latin:keySpec="န" - latin:moreKeys="္န" /> - <!-- U+1019: "မ" MYANMAR LETTER MA - U+1039/U+1019: "္မ" MYANMAR SIGN VIRAMA/MYANMAR LETTER MA --> - <Key - latin:keySpec="မ" - latin:moreKeys="္မ" /> - <!-- U+1021: "အ" MYANMAR LETTER A --> - <Key latin:keySpec="အ" /> - <!-- U+1015: "ပ" MYANMAR LETTER PA --> - <Key latin:keySpec="ပ" /> - <!-- U+1000: "က" MYANMAR LETTER KA - U+1039/U+1000: "္က" MYANMAR SIGN VIRAMA/MYANMAR LETTER KA --> - <Key - latin:keySpec="က" - latin:moreKeys="္က" /> - <!-- U+1004: "င" MYANMAR LETTER NGA --> - <Key latin:keySpec="င" /> - <!-- U+101E: "သ" MYANMAR LETTER SA --> - <Key latin:keySpec="သ" /> - <!-- U+1005: "စ" MYANMAR LETTER CA - U+1039/U+1005: "္စ" MYANMAR SIGN VIRAMA/MYANMAR LETTER CA --> - <Key - latin:keySpec="စ" - latin:moreKeys="္စ" /> - </default> - </switch> -</merge> diff --git a/java/res/xml/rowkeys_myanmar3.xml b/java/res/xml/rowkeys_myanmar3.xml deleted file mode 100644 index 4dafe09d7..000000000 --- a/java/res/xml/rowkeys_myanmar3.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2014, 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"> - <!-- U+101A: "ယ" MYANMAR LETTER YA --> - <Key latin:keySpec="ယ" /> - <!-- U+1039: "္" MYANMAR SIGN VIRAMA --> - <Key latin:keySpec="္" /> - <!-- U+1004/U+103A/U+1039: "င်္င" MYANMAR LETTER NGA/MYANMAR SIGN ASAT/MYANMAR SIGN VIRAMA --> - <Key - latin:keySpec="င်္" - latin:keyLabelFlags="followKeyLetterRatio" /> - <!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA --> - <Key latin:keySpec="ှ" /> - <!-- U+102E: "ီ" MYANMAR VOWEL SIGN II --> - <Key latin:keySpec="ီ" /> - <!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU --> - <Key latin:keySpec="ူ" /> - <!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA --> - <Key latin:keySpec="ါ" /> - <!-- U+1032: "ဲ" MYANMAR VOWEL SIGN AI --> - <Key latin:keySpec="ဲ" /> - <!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA --> - <Key latin:keySpec="ံ" /> - <!-- U+101F: "ဟ" MYANMAR LETTER HA --> - <Key latin:keySpec="ဟ" /> - </case> - <default> - <!-- U+1031: "ေ" MYANMAR VOWEL SIGN E --> - <Key latin:keySpec="ေ" /> - <!-- U+103B: "ျ" MYANMAR CONSONANT SIGN MEDIAL YA --> - <Key latin:keySpec="ျ" /> - <!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA --> - <Key latin:keySpec="ြ" /> - <!-- U+103D: "ွ" MYANMAR CONSONANT SIGN MEDIAL WA - U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA - U+103D/U+103E: "ွှ" MYANMAR CONSONANT SIGN MEDIAL WA/MYANMAR CONSONANT SIGN MEDIAL HA --> - <Key - latin:keySpec="ွ" - latin:moreKeys="ှ,ွှ" /> - <!-- U+102D: "ိ" MYANMAR VOWEL SIGN I - U+102E: "ီ" MYANMAR VOWEL SIGN II --> - <Key - latin:keySpec="ိ" - latin:moreKeys="ီ" /> - <!-- U+102F: "ု" MYANMAR VOWEL SIGN U - U+1030: "ူ" MYANMAR VOWEL SIGN UU --> - <Key - latin:keySpec="ု" - latin:moreKeys="ူ" /> - <!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA - U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA --> - <Key - latin:keySpec="ာ" - latin:moreKeys="ါ" /> - <!-- U+103A: "်" MYANMAR SIGN ASAT - U+1032: "ဲ" MYANMAR VOWEL SIGN AI --> - <Key - latin:keySpec="်" - latin:moreKeys="ဲ" /> - <!-- U+1037: "့" MYANMAR SIGN DOT BELOW - U+1036: "ံ" MYANMAR SIGN ANUSVARA --> - <Key - latin:keySpec="့" - latin:moreKeys="ံ" /> - <!-- U+1038: "း" MYANMAR SIGN VISARGA --> - <Key latin:keySpec="း" /> - </default> - </switch> -</merge> diff --git a/java/res/xml/rowkeys_myanmar4.xml b/java/res/xml/rowkeys_myanmar4.xml deleted file mode 100644 index a1befcfbb..000000000 --- a/java/res/xml/rowkeys_myanmar4.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2014, 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"> - <!-- U+1025: "ဥ" MYANMAR LETTER U --> - <Key latin:keySpec="ဥ" /> - <!-- U+1026: "ဦ" MYANMAR LETTER UU --> - <Key latin:keySpec="ဦ" /> - <!-- U+100C: "ဌ" MYANMAR LETTER TTHA --> - <Key latin:keySpec="ဌ" /> - <!-- U+100B: "ဋ" MYANMAR LETTER TTA --> - <Key latin:keySpec="ဋ" /> - <!-- U+100D: "ဍ" MYANMAR LETTER DDA --> - <Key latin:keySpec="ဍ" /> - <!-- U+1020: "ဠ" MYANMAR LETTER LLA --> - <Key latin:keySpec="ဠ" /> - <!-- U+100B/U+1039/U+100C: "ဋ္ဌ" MYANMAR LETTER TTA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA --> - <Key - latin:keySpec="ဋ္ဌ" - latin:keyLabelFlags="followKeyLetterRatio" /> - <!-- U+100F/U+1039/U+100D: "ဏ္ဍ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER DDA - U+100F/U+1039/U+100C: "ဏ္ဌ" MYANMAR LETTER NNA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA --> - <Key - latin:keySpec="ဏ္ဍ" - latin:moreKeys="ဏ္ဌ" - latin:keyLabelFlags="followKeyLetterRatio" /> - </case> - <default> - <!-- U+1016: "ဖ" MYANMAR LETTER PHA --> - <Key latin:keySpec="ဖ" /> - <!-- U+1011: "ထ" MYANMAR LETTER THA - U+1039/U+1011: "္ထ" MYANMAR SIGN VIRAMA/MYANMAR LETTER THA --> - <Key - latin:keySpec="ထ" - latin:moreKeys="္ထ" /> - <!-- U+1001: "ခ" MYANMAR LETTER KHA - U+1039/U+1001: "္ခ" MYANMAR SIGN VIRAMA/MYANMAR LETTER KHA --> - <Key - latin:keySpec="ခ" - latin:moreKeys="္ခ" /> - <!-- U+101C: "လ" MYANMAR LETTER LA - U+1039/U+101C: "္လ" MYANMAR SIGN VIRAMA/MYANMAR LETTER LA --> - <Key - latin:keySpec="လ" - latin:moreKeys="္လ" /> - <!-- U+1018: "ဘ" MYANMAR LETTER BHA - U+1039/U+1018: "္ဘ" MYANMAR SIGN VIRAMA/MYANMAR LETTER BHA --> - <Key - latin:keySpec="ဘ" - latin:moreKeys="္ဘ" /> - <!-- U+100A: "ည" MYANMAR LETTER NNYA - U+1009: "ဉ" MYANMAR LETTER NYA --> - <Key - latin:keySpec="ည" - latin:moreKeys="ဉ" /> - <!-- U+101B: "ရ" MYANMAR LETTER RA --> - <Key latin:keySpec="ရ" /> - <!-- U+101D: "ဝ" MYANMAR LETTER WA --> - <Key latin:keySpec="ဝ" /> - </default> - </switch> -</merge> diff --git a/java/res/xml/rowkeys_nepali_romanized3.xml b/java/res/xml/rowkeys_nepali_romanized3.xml index 24f590832..c6a1e283e 100644 --- a/java/res/xml/rowkeys_nepali_romanized3.xml +++ b/java/res/xml/rowkeys_nepali_romanized3.xml @@ -43,11 +43,6 @@ <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" /> <!-- U+0919: "ङ" DEVANAGARI LETTER NGA --> <Key latin:keySpec="ङ" /> - <!-- Because the font rendering system prior to API version 16 can't automatically - render dotted circle for incomplete combining letter of some scripts, different - set of Key definitions are needed based on the API version. --> - <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> - <Key latin:keyStyle="baseKeyDevanagariSignVirama" /> </case> <default> <!-- U+0937: "ष" DEVANAGARI LETTER SSA --> @@ -64,16 +59,14 @@ <Key latin:keySpec="न" /> <!-- U+092E: "म" DEVANAGARI LETTER MA --> <Key latin:keySpec="म" /> - <!-- U+0964: "।" DEVANAGARI DANDA - U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> - <Key - latin:keySpec="।" - latin:moreKeys="ऽ" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> - <Key latin:keyStyle="baseKeyDevanagariSignVirama" /> + <!-- U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> + <Key + latin:keyStyle="baseKeyDevanagariSignVirama" + latin:moreKeys="ऽ" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_nepali_traditional3_right5.xml b/java/res/xml/rowkeys_nepali_traditional3.xml index c7c73a446..c43c59386 100644 --- a/java/res/xml/rowkeys_nepali_traditional3_right5.xml +++ b/java/res/xml/rowkeys_nepali_traditional3.xml @@ -21,6 +21,27 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <switch> <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"> + <!-- U+0915/U+094D: "क्" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA --> + <Key + latin:keySpec="क्" + latin:keyLabelFlags="followKeyLetterRatio" /> + <!-- U+0939/U+094D/U+092E: "ह्म" DEVANAGARI LETTER HA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER MA --> + <Key + latin:keySpec="ह्म" + latin:keyLabelFlags="followKeyLetterRatio" /> + <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R --> + <Key latin:keySpec="ऋ" /> + <!-- U+0950: "ॐ" DEVANAGARI OM --> + <Key latin:keySpec="ॐ" /> + <!-- Because the font rendering system prior to API version 16 can't automatically + render dotted circle for incomplete combining letter of some scripts, different + set of Key definitions are needed based on the API version. --> + <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" /> + <Key latin:keyStyle="baseKeyDevanagariVowelSignAu" /> + <!-- U+0926/U+094D/U+092F: "द्य" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER YA --> + <Key + latin:keySpec="द्य" + latin:keyLabelFlags="followKeyLetterRatio" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> @@ -33,44 +54,36 @@ set of Key definitions are needed based on the API version. --> <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" /> - <!-- U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U --> - <Key - latin:keySpec="रु" - latin:moreKeys="!" - latin:keyLabelFlags="followKeyLetterRatio" /> - <Key - latin:keySpec="\?" - latin:keyLabelFlags="fontDefault" /> </case> <default> - <!-- Because the font rendering system prior to API version 16 can't automatically - render dotted circle for incomplete combining letter of some scripts, different - set of Key definitions are needed based on the API version. --> - <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" /> - <!-- U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> - <Key - latin:keyStyle="baseKeyDevanagariSignVisarga" - latin:moreKeys="ऽ" /> + <!-- U+0936: "श" DEVANAGARI LETTER SHA --> + <Key latin:keySpec="श" /> + <!-- U+0939: "ह" DEVANAGARI LETTER HA --> + <Key latin:keySpec="ह" /> + <!-- U+0905: "अ" DEVANAGARI LETTER A --> + <Key latin:keySpec="अ" /> + <!-- U+0916: "ख" DEVANAGARI LETTER KHA --> + <Key latin:keySpec="ख" /> + <!-- U+0926: "द" DEVANAGARI LETTER DA --> + <Key latin:keySpec="द" /> + <!-- U+0932: "ल" DEVANAGARI LETTER LA --> + <Key latin:keySpec="ल" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> - <!-- Override more keys with empty definition --> - <key-style latin:styleName="moreKeysDevanagariVowelSignE" /> <Key latin:keyStyle="baseKeyDevanagariVowelSignE" /> - <!-- U+0964: "।" DEVANAGARI DANDA --> - <Key latin:keySpec="।" /> - <!-- U+0930: "र" DEVANAGARI LETTER RA --> - <Key - latin:keySpec="र" - latin:moreKeys="!" /> <!-- Because the font rendering system prior to API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts, different set of Key definitions are needed based on the API version. --> - <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> + <include + latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" /> + <Key latin:keyStyle="baseKeyDevanagariSignVirama" /> + <!-- U+0930: "र" DEVANAGARI LETTER RA + U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U --> <Key - latin:keyStyle="baseKeyDevanagariSignVirama" - latin:moreKeys="\?" /> + latin:keySpec="र" + latin:moreKeys="रु" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_nepali_traditional3_left6.xml b/java/res/xml/rowkeys_nepali_traditional3_left6.xml deleted file mode 100644 index ade278710..000000000 --- a/java/res/xml/rowkeys_nepali_traditional3_left6.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2013, 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"> - <!-- U+0915/U+094D: "क्" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA --> - <Key - latin:keySpec="क्" - latin:keyLabelFlags="followKeyLetterRatio" /> - <!-- U+0939/U+094D/U+092E: "ह्म" DEVANAGARI LETTER HA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER MA --> - <Key - latin:keySpec="ह्म" - latin:keyLabelFlags="followKeyLetterRatio" /> - <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R --> - <Key latin:keySpec="ऋ" /> - <!-- U+0950: "ॐ" DEVANAGARI OM --> - <Key latin:keySpec="ॐ" /> - <!-- Because the font rendering system prior to API version 16 can't automatically - render dotted circle for incomplete combining letter of some scripts, different - set of Key definitions are needed based on the API version. --> - <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" /> - <Key latin:keyStyle="baseKeyDevanagariVowelSignAu" /> - <!-- U+0926/U+094D/U+092F: "द्य" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER YA --> - <Key - latin:keySpec="द्य" - latin:keyLabelFlags="followKeyLetterRatio" /> - </case> - <default> - <!-- U+0936: "श" DEVANAGARI LETTER SHA --> - <Key latin:keySpec="श" /> - <!-- U+0939: "ह" DEVANAGARI LETTER HA --> - <Key latin:keySpec="ह" /> - <!-- U+0905: "अ" DEVANAGARI LETTER A --> - <Key latin:keySpec="अ" /> - <!-- U+0916: "ख" DEVANAGARI LETTER KHA --> - <Key latin:keySpec="ख" /> - <!-- U+0926: "द" DEVANAGARI LETTER DA --> - <Key latin:keySpec="द" /> - <!-- U+0932: "ल" DEVANAGARI LETTER LA --> - <Key latin:keySpec="ल" /> - </default> - </switch> -</merge> diff --git a/java/res/xml/rowkeys_nepali_traditional3_right3.xml b/java/res/xml/rowkeys_nepali_traditional3_right3.xml deleted file mode 100644 index 4db438d81..000000000 --- a/java/res/xml/rowkeys_nepali_traditional3_right3.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2013, 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"> - <!-- Because the font rendering system prior to API version 16 can't automatically - render dotted circle for incomplete combining letter of some scripts, different - set of Key definitions are needed based on the API version. --> - <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" /> - <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" /> - <!-- U+0919: "ङ" DEVANAGARI LETTER NGA --> - <Key latin:keySpec="ङ" /> - <!-- Because the font rendering system prior to API version 16 can't automatically - render dotted circle for incomplete combining letter of some scripts, different - set of Key definitions are needed based on the API version. --> - <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" /> - <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" /> - </case> - <default> - <!-- Because the font rendering system prior to API version 16 can't automatically - render dotted circle for incomplete combining letter of some scripts, different - set of Key definitions are needed based on the API version. --> - <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" /> - <Key latin:keyStyle="baseKeyDevanagariVowelSignE" /> - <!-- U+0964: "।" DEVANAGARI DANDA --> - <Key latin:keySpec="।" /> - <!-- U+0930: "र" DEVANAGARI LETTER RA - U+0930/U+0941: "रु" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U --> - <Key - latin:keySpec="र" - latin:moreKeys="रु" /> - </default> - </switch> -</merge> diff --git a/java/res/xml/rowkeys_qwerty1.xml b/java/res/xml/rowkeys_qwerty1.xml index 8f3b160fe..b8e4a4c78 100644 --- a/java/res/xml/rowkeys_qwerty1.xml +++ b/java/res/xml/rowkeys_qwerty1.xml @@ -21,53 +21,10 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <Key - latin:keySpec="!text/keyspec_q" - latin:keyHintLabel="1" - latin:additionalMoreKeys="1" - latin:moreKeys="!text/morekeys_q" /> - <Key - latin:keySpec="!text/keyspec_w" - latin:keyHintLabel="2" - latin:additionalMoreKeys="2" - latin:moreKeys="!text/morekeys_w" /> - <Key - latin:keySpec="e" - latin:keyHintLabel="3" - latin:additionalMoreKeys="3" - latin:moreKeys="!text/morekeys_e" /> - <Key - latin:keySpec="r" - latin:keyHintLabel="4" - latin:additionalMoreKeys="4" - latin:moreKeys="!text/morekeys_r" /> - <Key - latin:keySpec="t" - latin:keyHintLabel="5" - latin:additionalMoreKeys="5" - latin:moreKeys="!text/morekeys_t" /> - <Key - latin:keySpec="!text/keyspec_y" - latin:keyHintLabel="6" - latin:additionalMoreKeys="6" - latin:moreKeys="!text/morekeys_y" /> - <Key - latin:keySpec="u" - latin:keyHintLabel="7" - latin:additionalMoreKeys="7" - latin:moreKeys="!text/morekeys_u" /> - <Key - latin:keySpec="i" - latin:keyHintLabel="8" - latin:additionalMoreKeys="8" - latin:moreKeys="!text/morekeys_i" /> - <Key - latin:keySpec="o" - latin:keyHintLabel="9" - latin:additionalMoreKeys="9" - latin:moreKeys="!text/morekeys_o" /> - <Key - latin:keySpec="p" - latin:keyHintLabel="0" - latin:additionalMoreKeys="0" /> + <!-- q,w,e,r,t --> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty1_left5" /> + <!-- y,u,i,o,p --> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty1_right5" /> </merge> diff --git a/java/res/xml/rowkeys_qwerty1_left5.xml b/java/res/xml/rowkeys_qwerty1_left5.xml new file mode 100644 index 000000000..ff9f1b2b5 --- /dev/null +++ b/java/res/xml/rowkeys_qwerty1_left5.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Key + latin:keySpec="!text/keyspec_q" + latin:keyHintLabel="1" + latin:additionalMoreKeys="1" + latin:moreKeys="!text/morekeys_q" /> + <Key + latin:keySpec="!text/keyspec_w" + latin:keyHintLabel="2" + latin:additionalMoreKeys="2" + latin:moreKeys="!text/morekeys_w" /> + <Key + latin:keySpec="e" + latin:keyHintLabel="3" + latin:additionalMoreKeys="3" + latin:moreKeys="!text/morekeys_e" /> + <Key + latin:keySpec="r" + latin:keyHintLabel="4" + latin:additionalMoreKeys="4" + latin:moreKeys="!text/morekeys_r" /> + <Key + latin:keySpec="t" + latin:keyHintLabel="5" + latin:additionalMoreKeys="5" + latin:moreKeys="!text/morekeys_t" /> +</merge> diff --git a/java/res/xml/rowkeys_qwerty1_right5.xml b/java/res/xml/rowkeys_qwerty1_right5.xml new file mode 100644 index 000000000..2b3cae2e8 --- /dev/null +++ b/java/res/xml/rowkeys_qwerty1_right5.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Key + latin:keySpec="!text/keyspec_y" + latin:keyHintLabel="6" + latin:additionalMoreKeys="6" + latin:moreKeys="!text/morekeys_y" /> + <Key + latin:keySpec="u" + latin:keyHintLabel="7" + latin:additionalMoreKeys="7" + latin:moreKeys="!text/morekeys_u" /> + <Key + latin:keySpec="i" + latin:keyHintLabel="8" + latin:additionalMoreKeys="8" + latin:moreKeys="!text/morekeys_i" /> + <Key + latin:keySpec="o" + latin:keyHintLabel="9" + latin:additionalMoreKeys="9" + latin:moreKeys="!text/morekeys_o" /> + <Key + latin:keySpec="p" + latin:keyHintLabel="0" + latin:additionalMoreKeys="0" /> +</merge> diff --git a/java/res/xml/rowkeys_qwerty2.xml b/java/res/xml/rowkeys_qwerty2.xml index 4077beaf6..550db3b3f 100644 --- a/java/res/xml/rowkeys_qwerty2.xml +++ b/java/res/xml/rowkeys_qwerty2.xml @@ -21,30 +21,10 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <Key - latin:keySpec="a" - latin:moreKeys="!text/morekeys_a" /> - <Key - latin:keySpec="s" - latin:moreKeys="!text/morekeys_s" /> - <Key - latin:keySpec="d" - latin:moreKeys="!text/morekeys_d" /> - <Key - latin:keySpec="f" /> - <Key - latin:keySpec="g" - latin:moreKeys="!text/morekeys_g" /> - <Key - latin:keySpec="h" - latin:moreKeys="!text/morekeys_h" /> - <Key - latin:keySpec="j" - latin:moreKeys="!text/morekeys_j" /> - <Key - latin:keySpec="k" - latin:moreKeys="!text/morekeys_k" /> - <Key - latin:keySpec="l" - latin:moreKeys="!text/morekeys_l" /> + <!-- a,s,d,f,g --> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty2_left5" /> + <!-- h,j,k,l --> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty2_right4" /> </merge> diff --git a/java/res/xml/kbd_myanmar.xml b/java/res/xml/rowkeys_qwerty2_left5.xml index af997b1c8..1803bf203 100644 --- a/java/res/xml/kbd_myanmar.xml +++ b/java/res/xml/rowkeys_qwerty2_left5.xml @@ -18,14 +18,21 @@ */ --> -<Keyboard +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - latin:rowHeight="20%p" - latin:verticalGap="@fraction/config_key_vertical_gap_5row" - latin:keyLetterSize="@fraction/config_key_letter_ratio_5row" - latin:keyShiftedLetterHintRatio="@fraction/config_key_shifted_letter_hint_ratio_5row" - latin:touchPositionCorrectionData="@array/touch_position_correction_data_default" > - <include - latin:keyboardLayout="@xml/rows_myanmar" /> -</Keyboard> + <Key + latin:keySpec="a" + latin:moreKeys="!text/morekeys_a" /> + <Key + latin:keySpec="s" + latin:moreKeys="!text/morekeys_s" /> + <Key + latin:keySpec="d" + latin:moreKeys="!text/morekeys_d" /> + <Key + latin:keySpec="f" /> + <Key + latin:keySpec="g" + latin:moreKeys="!text/morekeys_g" /> +</merge> diff --git a/java/res/xml/rowkeys_qwerty2_right4.xml b/java/res/xml/rowkeys_qwerty2_right4.xml new file mode 100644 index 000000000..99936b7a2 --- /dev/null +++ b/java/res/xml/rowkeys_qwerty2_right4.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Key + latin:keySpec="h" + latin:moreKeys="!text/morekeys_h" /> + <Key + latin:keySpec="j" + latin:moreKeys="!text/morekeys_j" /> + <Key + latin:keySpec="k" + latin:moreKeys="!text/morekeys_k" /> + <Key + latin:keySpec="l" + latin:moreKeys="!text/morekeys_l" /> +</merge> diff --git a/java/res/xml/rowkeys_qwerty3.xml b/java/res/xml/rowkeys_qwerty3.xml index 8562003d2..7a523f1f6 100644 --- a/java/res/xml/rowkeys_qwerty3.xml +++ b/java/res/xml/rowkeys_qwerty3.xml @@ -21,23 +21,10 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > - <Key - latin:keySpec="z" - latin:moreKeys="!text/morekeys_z" /> - <Key - latin:keySpec="!text/keyspec_x" - latin:moreKeys="!text/morekeys_x" /> - <Key - latin:keySpec="c" - latin:moreKeys="!text/morekeys_c" /> - <Key - latin:keySpec="v" - latin:moreKeys="!text/morekeys_v" /> - <Key - latin:keySpec="b" /> - <Key - latin:keySpec="n" - latin:moreKeys="!text/morekeys_n" /> - <Key - latin:keySpec="m" /> + <!-- z,x,c,v --> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty3_left4" /> + <!-- b,n,m --> + <include + latin:keyboardLayout="@xml/rowkeys_qwerty3_right3" /> </merge> diff --git a/java/res/xml/rowkeys_qwerty3_left4.xml b/java/res/xml/rowkeys_qwerty3_left4.xml new file mode 100644 index 000000000..6043c3bba --- /dev/null +++ b/java/res/xml/rowkeys_qwerty3_left4.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Key + latin:keySpec="z" + latin:moreKeys="!text/morekeys_z" /> + <Key + latin:keySpec="!text/keyspec_x" + latin:moreKeys="!text/morekeys_x" /> + <Key + latin:keySpec="c" + latin:moreKeys="!text/morekeys_c" /> + <Key + latin:keySpec="v" + latin:moreKeys="!text/morekeys_v" /> +</merge> diff --git a/java/res/xml/rowkeys_qwerty3_right3.xml b/java/res/xml/rowkeys_qwerty3_right3.xml new file mode 100644 index 000000000..f69910344 --- /dev/null +++ b/java/res/xml/rowkeys_qwerty3_right3.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<merge + xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" +> + <Key + latin:keySpec="b" /> + <Key + latin:keySpec="n" + latin:moreKeys="!text/morekeys_n" /> + <Key + latin:keySpec="m" /> +</merge> diff --git a/java/res/xml/rowkeys_serbian_qwertz1.xml b/java/res/xml/rowkeys_serbian_qwertz1.xml new file mode 100644 index 000000000..1615701d3 --- /dev/null +++ b/java/res/xml/rowkeys_serbian_qwertz1.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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/rowkeys_qwertz1" /> + <!-- U+0161: "š" LATIN SMALL LETTER S WITH CARON --> + <Key latin:keySpec="š" /> +</merge>
\ No newline at end of file diff --git a/java/res/xml/rowkeys_serbian_qwertz2.xml b/java/res/xml/rowkeys_serbian_qwertz2.xml new file mode 100644 index 000000000..83ec92d29 --- /dev/null +++ b/java/res/xml/rowkeys_serbian_qwertz2.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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/rowkeys_qwerty2" /> + <!-- U+010D: "č" LATIN SMALL LETTER C WITH CARON --> + <Key latin:keySpec="č" /> + <!-- U+0107: "ć" LATIN SMALL LETTER C WITH ACUTE --> + <Key latin:keySpec="ć" /> +</merge> diff --git a/java/res/xml/rowkeys_serbian_qwertz3.xml b/java/res/xml/rowkeys_serbian_qwertz3.xml new file mode 100644 index 000000000..30ba7afa2 --- /dev/null +++ b/java/res/xml/rowkeys_serbian_qwertz3.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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/rowkeys_qwertz3" /> + <!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE --> + <Key latin:keySpec="đ" /> + <!-- U+017E: "ž" LATIN SMALL LETTER Z WITH CARON --> + <Key latin:keySpec="ž" /> +</merge> diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml index 811915825..e55b1b835 100644 --- a/java/res/xml/rowkeys_symbols2.xml +++ b/java/res/xml/rowkeys_symbols2.xml @@ -44,7 +44,8 @@ </default> </switch> <Key - latin:keyStyle="currencyKeyStyle" /> + latin:keyStyle="currencyKeyStyle" + latin:keyLabelFlags="followKeyLetterRatio" /> <Key latin:keySpec="!text/keyspec_symbols_percent" latin:moreKeys="!text/morekeys_symbols_percent" /> diff --git a/java/res/xml/rowkeys_telugu2.xml b/java/res/xml/rowkeys_telugu2.xml index a472fd3f8..f1ce459e5 100644 --- a/java/res/xml/rowkeys_telugu2.xml +++ b/java/res/xml/rowkeys_telugu2.xml @@ -51,10 +51,10 @@ latin:moreKeys="ఫ" /> <!-- U+0C30: "ర" TELUGU LETTER RA U+0C31: "ఱ" TELUGU LETTER RRA - U+0C43: "ృ" TELUGU VOWEL SIGN VOCALIC R --> + U+0C4D/U+0C30: "్ర" TELUGU SIGN VIRAMA/TELUGU LETTER RA --> <Key latin:keySpec="ర" - latin:moreKeys="ఱ,ృ" /> + latin:moreKeys="ఱ,్ర" /> <!-- U+0C15: "క" TELUGU LETTER KA U+0C16: "ఖ" TELUGU LETTER KHA --> <Key diff --git a/java/res/xml/rowkeys_telugu3.xml b/java/res/xml/rowkeys_telugu3.xml index 05755ec4d..2e3730ac7 100644 --- a/java/res/xml/rowkeys_telugu3.xml +++ b/java/res/xml/rowkeys_telugu3.xml @@ -19,24 +19,28 @@ --> <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> - <!-- U+0C46: "ె" TELUGU VOWEL SIGN E + <!-- U+0C4A: "ొ" TELUGU VOWEL SIGN O U+0C12: "ఒ" TELUGU LETTER O --> <Key - latin:keySpec="ె" + latin:keySpec="ొ" latin:moreKeys="ఒ" /> - <!-- U+0C02: "ం" TELUGU SIGN ANUSVARA + <!-- U+0C46: "ె" TELUGU VOWEL SIGN E U+0C0E: "ఎ" TELUGU LETTER E --> <Key - latin:keySpec="ం" + latin:keySpec="ె" latin:moreKeys="ఎ" /> - <!-- U+0C2E: "మ" TELUGU LETTER MA --> - <Key latin:keySpec="మ" /> + <!-- U+0C2E: "మ" TELUGU LETTER MA + U+0C02: "ం" TELUGU SIGN ANUSVARA + U+0C01: "ఁ" TELUGU SIGN CANDRABINDU --> + <Key latin:keySpec="మ" + latin:moreKeys="ం,ఁ" /> <!-- U+0C28: "న" TELUGU LETTER NA U+0C23: "ణ" TELUGU LETTER NNA - U+0C19: "ఙ" TELUGU LETTER NGA --> + U+0C19: "ఙ" TELUGU LETTER NGA + U+0C1E: "ఞ" TELUGU LETTER NYA --> <Key latin:keySpec="న" - latin:moreKeys="ణ,ఙ" /> + latin:moreKeys="ణ,ఙ,ఞ" /> <!-- U+0C35: "వ" TELUGU LETTER VA --> <Key latin:keySpec="వ" /> <!-- U+0C32: "ల" TELUGU LETTER LA @@ -50,10 +54,10 @@ latin:keySpec="స" latin:moreKeys="శ" /> <!-- U+0C0B: "ఋ" TELUGU LETTER VOCALIC R - U+0C4D/U+0C30: "్ర" TELUGU SIGN VIRAMA/TELUGU LETTER RA --> + U+0C43: "ృ" TELUGU VOWEL SIGN VOCALIC R --> <Key latin:keySpec="ఋ" - latin:moreKeys="్ర" /> + latin:moreKeys="ృ" /> <!-- U+0C37: "ష" TELUGU LETTER SSA U+0C15/U+0C4D/U+0C37: "క్ష" TELUGU LETTER KA/TELUGU SIGN VIRAMA/TELUGU LETTER SSA --> <Key diff --git a/java/res/xml/rowkeys_uzbek1.xml b/java/res/xml/rowkeys_uzbek1.xml new file mode 100644 index 000000000..967e9a76b --- /dev/null +++ b/java/res/xml/rowkeys_uzbek1.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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/rowkeys_qwerty1" /> + <!-- U+006F/U+02BB: "oʻ" LATIN SMALL LETTER O/MODIFIER LETTER TURNED COMMA --> + <Key + latin:keySpec="oʻ" + latin:keyLabelFlags="followKeyLetterRatio" /> +</merge>
\ No newline at end of file diff --git a/java/res/xml/rowkeys_uzbek2.xml b/java/res/xml/rowkeys_uzbek2.xml new file mode 100644 index 000000000..b768a12a4 --- /dev/null +++ b/java/res/xml/rowkeys_uzbek2.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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/rowkeys_qwerty2" /> + <!-- U+0067/U+02BB: "gʻ" LATIN SMALL LETTER G/MODIFIER LETTER TURNED COMMA --> + <Key + latin:keySpec="gʻ" + latin:keyLabelFlags="followKeyLetterRatio" /> + <!-- U+02BC: "ʼ" MODIFIER LETTER APOSTROPHE --> + <Key latin:keySpec="ʼ" /> +</merge>
\ No newline at end of file diff --git a/java/res/xml/rows_myanmar.xml b/java/res/xml/rows_bengali_akkhor.xml index 54538a9b9..1c7e77262 100644 --- a/java/res/xml/rows_myanmar.xml +++ b/java/res/xml/rows_bengali_akkhor.xml @@ -18,33 +18,28 @@ */ --> -<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > <include latin:keyboardLayout="@xml/key_styles_common" /> <Row - latin:keyWidth="10.0%p" - latin:keyLabelFlags="fontNormal|autoXScale" - > - <include latin:keyboardLayout="@xml/rowkeys_myanmar1" /> + latin:keyLabelFlags="fontNormal" + latin:keyWidth="9.091%p" > + <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor1" /> </Row> <Row - latin:keyWidth="10.0%p" - latin:keyLabelFlags="fontNormal|autoXScale" - > - <include latin:keyboardLayout="@xml/rowkeys_myanmar2" /> + latin:keyLabelFlags="fontNormal" + latin:keyWidth="9.091%p" > + <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor2" /> </Row> <Row - latin:keyWidth="10.0%p" - latin:keyLabelFlags="fontNormal|autoXScale" - > - <include latin:keyboardLayout="@xml/rowkeys_myanmar3" /> - </Row> - <Row - latin:keyWidth="10.0%p" - latin:keyLabelFlags="fontNormal|autoXScale" - > - <Key latin:keyStyle="shiftKeyStyle" /> - <include latin:keyboardLayout="@xml/rowkeys_myanmar4" /> - <Key latin:keyStyle="deleteKeyStyle" /> + latin:keyLabelFlags="fontNormal" + latin:keyWidth="8.711%p" > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.8%p" /> + <include latin:keyboardLayout="@xml/rowkeys_bengali_akkhor3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> -</merge>
\ No newline at end of file +</merge> diff --git a/java/res/xml/rows_nepali_romanized.xml b/java/res/xml/rows_nepali_romanized.xml index daca3ee86..26737ec8a 100644 --- a/java/res/xml/rows_nepali_romanized.xml +++ b/java/res/xml/rows_nepali_romanized.xml @@ -33,16 +33,18 @@ <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" /> </Row> <Row - latin:keyWidth="8.711%p" + latin:keyWidth="8.75%p" latin:keyLabelFlags="fontNormal" > <Key latin:keyStyle="shiftKeyStyle" - latin:keyWidth="10.8%p" /> + latin:keyWidth="15%p" + latin:visualInsetsRight="1%p" /> <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" /> <Key latin:keyStyle="deleteKeyStyle" - latin:keyWidth="fillRight" /> + latin:keyWidth="fillRight" + latin:visualInsetsLeft="1%p" /> </Row> <include latin:keyboardLayout="@xml/row_qwerty4" /> </merge> diff --git a/java/res/xml/rows_nepali_traditional.xml b/java/res/xml/rows_nepali_traditional.xml index edcc73a20..e2e710ce8 100644 --- a/java/res/xml/rows_nepali_traditional.xml +++ b/java/res/xml/rows_nepali_traditional.xml @@ -40,8 +40,7 @@ <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.8%p" /> - <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" /> - <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right3" /> + <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml index d8d15080e..0f92ac605 100644 --- a/java/res/xml/rows_number_normal.xml +++ b/java/res/xml/rows_number_normal.xml @@ -35,7 +35,8 @@ latin:keySpec="-" latin:moreKeys="+" latin:keyLabelFlags="hasPopupHint" - latin:keyStyle="numFunctionalKeyStyle" + latin:keyStyle="numKeyStyle" + latin:backgroundType="functional" latin:keyWidth="fillRight" /> </Row> <Row> @@ -54,7 +55,8 @@ > <Key latin:keySpec="." - latin:keyStyle="numFunctionalKeyStyle" + latin:keyStyle="numKeyStyle" + latin:backgroundType="functional" latin:keyWidth="fillRight" /> </case> <case @@ -62,15 +64,17 @@ > <Key latin:keySpec="." - latin:keyLabelFlags="hasPopupHint" latin:moreKeys="!text/morekeys_am_pm" - latin:keyStyle="numFunctionalKeyStyle" + latin:keyLabelFlags="hasPopupHint" + latin:keyStyle="numKeyStyle" + latin:backgroundType="functional" latin:keyWidth="fillRight" /> </case> <default> <Key latin:keySpec="," - latin:keyStyle="numFunctionalKeyStyle" + latin:keyStyle="numKeyStyle" + latin:backgroundType="functional" latin:keyWidth="fillRight" /> </default> </switch> diff --git a/java/res/xml/rows_number_password.xml b/java/res/xml/rows_number_password.xml index 2e61a08ae..65736c430 100644 --- a/java/res/xml/rows_number_password.xml +++ b/java/res/xml/rows_number_password.xml @@ -70,7 +70,8 @@ <Key latin:keyStyle="deleteKeyStyle" /> <Key - latin:keyStyle="num0KeyStyle" /> + latin:keyStyle="num0KeyStyle" + latin:keyHintLabel="+" /> <Key latin:keyStyle="enterKeyStyle" /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> diff --git a/java/res/xml/rows_phone.xml b/java/res/xml/rows_phone.xml index 03e45419a..bb5590d4e 100644 --- a/java/res/xml/rows_phone.xml +++ b/java/res/xml/rows_phone.xml @@ -36,7 +36,8 @@ latin:keySpec="-" latin:moreKeys="+" latin:keyLabelFlags="hasPopupHint" - latin:keyStyle="numFunctionalKeyStyle" + latin:keyStyle="numKeyStyle" + latin:backgroundType="functional" latin:keyWidth="fillRight" /> </Row> <Row> @@ -48,7 +49,8 @@ latin:keyStyle="num6KeyStyle" /> <Key latin:keySpec="." - latin:keyStyle="numFunctionalKeyStyle" + latin:keyStyle="numKeyStyle" + latin:backgroundType="functional" latin:keyWidth="fillRight" /> </Row> <Row> diff --git a/java/res/xml/rows_phone_symbols.xml b/java/res/xml/rows_phone_symbols.xml index 983bfb5c8..195a183a3 100644 --- a/java/res/xml/rows_phone_symbols.xml +++ b/java/res/xml/rows_phone_symbols.xml @@ -28,45 +28,53 @@ <Row> <Key latin:keySpec="(" - latin:keyStyle="numKeyStyle" /> + latin:keyStyle="numSymbolKeyStyle" /> <Key latin:keySpec="/" - latin:keyStyle="numKeyStyle" /> + latin:keyStyle="numSymbolKeyStyle" /> <Key latin:keySpec=")" - latin:keyStyle="numKeyStyle" /> + latin:keyStyle="numSymbolKeyStyle" /> <Key latin:keySpec="-" latin:moreKeys="+" latin:keyLabelFlags="hasPopupHint" - latin:keyStyle="numFunctionalKeyStyle" + latin:keyStyle="numKeyStyle" + latin:backgroundType="functional" latin:keyWidth="fillRight" /> </Row> <Row> <Key latin:keySpec="N" - latin:keyStyle="numKeyBaseStyle" /> + latin:keyStyle="numSymbolKeyStyle" /> <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this has changed. --> <Key - latin:keyStyle="numPauseKeyStyle" /> + latin:keySpec="!string/label_pause_key|," + latin:keyLabelFlags="followKeyLabelRatio|autoXScale" + latin:keyStyle="numSymbolKeyStyle" /> <Key latin:keySpec="," - latin:keyStyle="numKeyStyle" /> + latin:keyStyle="numSymbolKeyStyle" /> <Key latin:keySpec="." - latin:keyStyle="numFunctionalKeyStyle" + latin:keyStyle="numKeyStyle" + latin:backgroundType="functional" latin:keyWidth="fillRight" /> </Row> <Row> + <!-- U+FF0A: "＊" FULLWIDTH ASTERISK --> <Key - latin:keyStyle="numStarKeyStyle" /> + latin:keySpec="＊|*" + latin:keyStyle="numSymbolKeyStyle" /> <!-- Wait is a semicolon. --> <Key - latin:keyStyle="numWaitKeyStyle" /> + latin:keySpec="!string/label_wait_key|;" + latin:keyLabelFlags="followKeyLabelRatio|autoXScale" + latin:keyStyle="numSymbolKeyStyle" /> <Key latin:keySpec="\#" - latin:keyStyle="numKeyStyle" /> + latin:keyStyle="numSymbolKeyStyle" /> <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" /> @@ -76,7 +84,7 @@ latin:keyStyle="numPhoneToNumericKeyStyle" /> <Key latin:keySpec="+" - latin:keyStyle="numKeyStyle" /> + latin:keyStyle="numSymbolKeyStyle" /> <Key latin:keyStyle="numSpaceKeyStyle" /> <Key diff --git a/java/res/xml/rows_serbian_qwertz.xml b/java/res/xml/rows_serbian_qwertz.xml new file mode 100644 index 000000000..4be2abf1a --- /dev/null +++ b/java/res/xml/rows_serbian_qwertz.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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="9.091%p" > + <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" /> + </Row> + <Row latin:keyWidth="9.091%p" > + <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz2" /> + </Row> + <Row latin:keyWidth="8.711%p" > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="10.8%p" /> + <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" /> + </Row> + <include latin:keyboardLayout="@xml/row_qwerty4" /> +</merge>
\ No newline at end of file diff --git a/java/res/xml/rows_uzbek.xml b/java/res/xml/rows_uzbek.xml new file mode 100644 index 000000000..ae655d814 --- /dev/null +++ b/java/res/xml/rows_uzbek.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2014, 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="9.091%p" > + <include latin:keyboardLayout="@xml/rowkeys_uzbek1" /> + </Row> + <Row latin:keyWidth="9.091%p" > + <include latin:keyboardLayout="@xml/rowkeys_uzbek2" /> + </Row> + <Row latin:keyWidth="9.2%p" > + <Key + latin:keyStyle="shiftKeyStyle" + latin:keyWidth="15%p" + latin:visualInsetsRight="1%p" /> + <Spacer latin:keyWidth="2.8%p" /> + <include latin:keyboardLayout="@xml/rowkeys_qwerty3" /> + <Key + latin:keyStyle="deleteKeyStyle" + latin:keyWidth="fillRight" + latin:keyXPos="-15%p" + latin:visualInsetsLeft="1%p" /> + </Row> + <include latin:keyboardLayout="@xml/row_qwerty4" /> +</merge>
\ No newline at end of file |