diff options
Diffstat (limited to 'java/res/xml-v16')
18 files changed, 335 insertions, 187 deletions
diff --git a/java/res/xml-v16/key_devanagari_sign_anusvara.xml b/java/res/xml-v16/key_devanagari_sign_anusvara.xml deleted file mode 100644 index 27c7bff5a..000000000 --- a/java/res/xml-v16/key_devanagari_sign_anusvara.xml +++ /dev/null @@ -1,32 +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. -*/ ---> - -<!-- The code point U+25CC for key label is needed because the font rendering system prior to - API version 16 can't automatically render dotted circle for incomplete combining letter - of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the - counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<merge - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" -> - <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA --> - <Key - latin:keyLabel="ं" - latin:keyLabelFlags="fontNormal" /> -</merge> diff --git a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml new file mode 100644 index 000000000..d5491d29d --- /dev/null +++ b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml @@ -0,0 +1,51 @@ +<?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. +*/ +--> + +<!-- The code point U+25CC for key label is needed because the font rendering system prior to + API version 16 can't automatically render dotted circle for incomplete combining letter + of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the + counterpart files named res/xml-v16/key_*.xml don't have this hack. --> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA + U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU + U+093C: "़" DEVANAGARI SIGN NUKTA --> + <key-style + latin:styleName="moreKeysDevanagariSignAnusvara" + latin:moreKeys="ः,ँ,़" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA + U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU --> + <key-style + latin:styleName="moreKeysDevanagariSignAnusvara" + latin:moreKeys="ः,ँ" /> + </case> + <default> + <key-style latin:styleName="moreKeysDevanagariSignAnusvara" /> + </default> + </switch> + <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA --> + <key-style + latin:styleName="baseKeyDevanagariSignAnusvara" + latin:parentStyle="moreKeysDevanagariSignAnusvara" + latin:keySpec="ं" /> +</merge> diff --git a/java/res/xml-v16/key_devanagari_sign_candrabindu.xml b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml index 03017dd78..ef8dec37c 100644 --- a/java/res/xml-v16/key_devanagari_sign_candrabindu.xml +++ b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml @@ -22,27 +22,21 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > - <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU - U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E --> + <case latin:keyboardLayoutSet="hindi"> + <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E --> <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" latin:moreKeys="ॅ" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariSignCandrabindu" /> + <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" /> </default> </switch> <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU --> - <Key - latin:keyStyle="moreKeysDevanagariSignCandrabindu" - latin:keyLabel="ँ" - latin:keyLabelFlags="fontNormal" /> + <key-style + latin:styleName="baseKeyDevanagariSignCandrabindu" + latin:parentStyle="moreKeysDevanagariSignCandrabindu" + latin:keySpec="ँ" /> </merge> diff --git a/java/res/xml-v16/key_devanagari_sign_nukta.xml b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml index 09c347706..734d0600a 100644 --- a/java/res/xml-v16/key_devanagari_sign_nukta.xml +++ b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml @@ -22,28 +22,29 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP U+0970: "॰" DEVANAGARI ABBREVIATION SIGN U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> - <key-style + <key-style latin:styleName="moreKeysDevanagariSignNukta" latin:moreKeys="ॽ,॰,ऽ" /> </case> + <case latin:keyboardLayoutSet="nepali_romanized"> + <!-- U+093C: "़" DEVANAGARI SIGN NUKTA --> + <key-style + latin:styleName="moreKeysDevanagariSignNukta" + latin:moreKeys="़" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariSignNukta" /> + <key-style latin:styleName="moreKeysDevanagariSignNukta" /> </default> </switch> <!-- U+093C: "़" DEVANAGARI SIGN NUKTA --> - <Key - latin:keyStyle="moreKeysDevanagariSignNukta" - latin:keyLabel="़" - latin:keyLabelFlags="fontNormal" /> + <key-style + latin:styleName="baseKeyDevanagariSignNukta" + latin:parentStyle="moreKeysDevanagariSignNukta" + latin:keySpec="़" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml index a2fbf53d3..0300e4a8b 100644 --- a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml +++ b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml @@ -22,12 +22,27 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> + <switch> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA --> + <key-style + latin:styleName="moreKeysDevanagariSignVirama" + latin:moreKeys="्" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0905: "अ" DEVANAGARI LETTER A --> + <key-style + latin:styleName="moreKeysDevanagariSignVirama" + latin:moreKeys="अ" /> + </case> + <default> + <key-style latin:styleName="moreKeysDevanagariSignVirama" /> + </default> + </switch> <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA --> <key-style latin:styleName="baseKeyDevanagariSignVirama" - latin:keyLabel="्" - latin:keyLabelFlags="fontNormal" /> + latin:parentStyle="moreKeysDevanagariSignVirama" + latin:keySpec="्" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml index ac56cb77b..ea64a1009 100644 --- a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml +++ b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml @@ -22,12 +22,9 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA --> <key-style latin:styleName="baseKeyDevanagariSignVisarga" - latin:keyLabel="ः" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ः" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml index 8e256032c..1e638507a 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml @@ -22,28 +22,34 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA U+093E/U+0901: "ाँ" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU --> <key-style latin:styleName="moreKeysDevanagariVowelSignAa" latin:moreKeys="ां,ाँ,%" /> </case> - <default> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignAa" + latin:moreKeys="ा,%" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0906: "आ" DEVANAGARI LETTER AA --> <key-style - latin:styleName="moreKeysDevanagariVowelSignAa" /> + latin:styleName="moreKeysDevanagariVowelSignAa" + latin:moreKeys="आ,%" /> + </case> + <default> + <key-style latin:styleName="moreKeysDevanagariVowelSignAa" /> </default> </switch> <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA --> <key-style latin:styleName="baseKeyDevanagariVowelSignAa" latin:parentStyle="moreKeysDevanagariVowelSignAa" - latin:keyLabel="ा" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ा" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml index e79033971..acb289406 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml @@ -22,35 +22,39 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="moreKeysDevanagariVowelSignAi" latin:moreKeys="ैं,%" /> </case> - <case - latin:keyboardLayoutSet="nepali_traditional" - > + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignAi" + latin:moreKeys="ै,%" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0910: "ऐ" DEVANAGARI LETTER AI --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignAi" + latin:moreKeys="ऐ,%" /> + </case> + <case latin:keyboardLayoutSet="nepali_traditional"> <!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> <key-style latin:styleName="moreKeysDevanagariVowelSignAi" latin:moreKeys="श्र" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignAi" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignAi" /> </default> </switch> <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI --> <key-style latin:styleName="baseKeyDevanagariVowelSignAi" latin:parentStyle="moreKeysDevanagariVowelSignAi" - latin:keyLabel="ै" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ै" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml index 43387a388..e2c367784 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml @@ -22,27 +22,33 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!--U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="moreKeysDevanagariVowelSignAu" latin:moreKeys="ौं,%" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignAu" + latin:moreKeys="ौ,%" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0914: "औ" DEVANAGARI LETTER AU --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignAu" + latin:moreKeys="औ,%" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignAu" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignAu" /> </default> </switch> <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU --> <key-style latin:styleName="baseKeyDevanagariVowelSignAu" latin:parentStyle="moreKeysDevanagariVowelSignAu" - latin:keyLabel="ौ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ौ" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml new file mode 100644 index 000000000..75ad44f34 --- /dev/null +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.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. +*/ +--> + +<!-- The code point U+25CC for key label is needed because the font rendering system prior to + API version 16 can't automatically render dotted circle for incomplete combining letter + of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the + counterpart files named res/xml-v16/key_*.xml don't have this hack. --> +<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> + <switch> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignCandraE" + latin:moreKeys="ॅ" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignCandraE" + latin:moreKeys="ऍ" /> + </case> + <default> + <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" /> + </default> + </switch> + <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E --> + <key-style + latin:styleName="baseKeyDevanagariVowelSignCandraE" + latin:parentStyle="moreKeysDevanagariVowelSignCandraE" + latin:keySpec="ॅ" /> +</merge> diff --git a/java/res/xml-v16/key_devanagari_vowel_sign_candra_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml index 0316a7bde..e1a4c613c 100644 --- a/java/res/xml-v16/key_devanagari_vowel_sign_candra_o.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml @@ -22,11 +22,27 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> + <switch> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignCandraO" + latin:moreKeys="ॉ" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignCandraO" + latin:moreKeys="ऑ" /> + </case> + <default> + <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" /> + </default> + </switch> <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O --> - <Key - latin:keyLabel="ॉ" - latin:keyLabelFlags="fontNormal" /> + <key-style + latin:styleName="baseKeyDevanagariVowelSignCandraO" + latin:parentStyle="moreKeysDevanagariVowelSignCandraO" + latin:keySpec="ॉ" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml index c70d9d944..6a99eace0 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml @@ -22,21 +22,27 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="moreKeysDevanagariVowelSignE" latin:moreKeys="ें" /> </case> - <case - latin:keyboardLayoutSet="nepali_traditional" - > + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignE" + latin:moreKeys="े" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignE" + latin:moreKeys="ए" /> + </case> + <case latin:keyboardLayoutSet="nepali_traditional"> <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> <key-style @@ -44,14 +50,12 @@ latin:moreKeys="ः,ऽ" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignE" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignE" /> </default> </switch> <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E --> <key-style latin:styleName="baseKeyDevanagariVowelSignE" latin:parentStyle="moreKeysDevanagariVowelSignE" - latin:keyLabel="े" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="े" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml index 845c1b02e..b66149d28 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml @@ -22,27 +22,33 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="moreKeysDevanagariVowelSignI" latin:moreKeys="िं" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignI" + latin:moreKeys="ि" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0907: "इ" DEVANAGARI LETTER I --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignI" + latin:moreKeys="इ" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignI" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignI" /> </default> </switch> <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I --> <key-style latin:styleName="baseKeyDevanagariVowelSignI" latin:parentStyle="moreKeysDevanagariVowelSignI" - latin:keyLabel="ि" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ि" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml index 0de9650be..97e500713 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml @@ -22,27 +22,33 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="moreKeysDevanagariVowelSignIi" latin:moreKeys="ीं,%" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignIi" + latin:moreKeys="ी,%" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0908: "ई" DEVANAGARI LETTER II --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignIi" + latin:moreKeys="ई,%" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignIi" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignIi" /> </default> </switch> <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II --> <key-style latin:styleName="baseKeyDevanagariVowelSignIi" latin:parentStyle="moreKeysDevanagariVowelSignIi" - latin:keyLabel="ी" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ी" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml index 06f07fac9..7cec76d43 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml @@ -22,29 +22,35 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > - <!-- U+094B/U+0902: "қं" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA + <case latin:keyboardLayoutSet="hindi"> + <!-- U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O --> <key-style latin:styleName="moreKeysDevanagariVowelSignO" latin:moreKeys="ों,ॉ,ॊ" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignO" + latin:moreKeys="ो" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0913: "ओ" DEVANAGARI LETTER O --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignO" + latin:moreKeys="ओ" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignO" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignO" /> </default> </switch> <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O --> <key-style latin:styleName="baseKeyDevanagariVowelSignO" latin:parentStyle="moreKeysDevanagariVowelSignO" - latin:keyLabel="ो" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ो" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml index 469a27bdf..c14f920bc 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml @@ -22,28 +22,34 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA U+0941/U+0901: "ुँ" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU --> <key-style latin:styleName="moreKeysDevanagariVowelSignU" latin:moreKeys="ुं,ुँ" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignU" + latin:moreKeys="ु" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0909: "उ" DEVANAGARI LETTER U --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignU" + latin:moreKeys="उ" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignU" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignU" /> </default> </switch> <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U --> <key-style latin:styleName="baseKeyDevanagariVowelSignU" latin:parentStyle="moreKeysDevanagariVowelSignU" - latin:keyLabel="ु" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ु" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml index 25867c086..3134de7c8 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml @@ -22,28 +22,34 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA U+0942/U+0901: "ूँ" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU --> <key-style latin:styleName="moreKeysDevanagariVowelSignUu" latin:moreKeys="ूं,ूँ,%" /> </case> + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignUu" + latin:moreKeys="ू,%" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+090A: "ऊ" DEVANAGARI LETTER UU --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignUu" + latin:moreKeys="ऊ,%" /> + </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignUu" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignUu" /> </default> </switch> <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU --> <key-style latin:styleName="baseKeyDevanagariVowelSignUu" latin:parentStyle="moreKeysDevanagariVowelSignUu" - latin:keyLabel="ू" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ू" /> </merge> diff --git a/java/res/xml-v16/key_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml index 4dd3e85cc..da510c1f5 100644 --- a/java/res/xml-v16/key_devanagari_vowel_sign_vocalic_r.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml @@ -22,34 +22,42 @@ API version 16 can't automatically render dotted circle for incomplete combining letter of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the counterpart files named res/xml-v16/key_*.xml don't have this hack. --> -<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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <case latin:keyboardLayoutSet="hindi"> <!-- U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR --> <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" latin:moreKeys="ॄ" /> </case> - <case - latin:keyboardLayoutSet="nepali_traditional" - > + <case latin:keyboardLayoutSet="hindi_compact"> + <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R + U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignVocalicR" + latin:moreKeys="ऋ,ृ" /> + </case> + <case latin:keyboardLayoutSet="marathi"> + <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA + U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R + U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R --> + <key-style + latin:styleName="moreKeysDevanagariVowelSignVocalicR" + latin:moreKeys="ऱ,ऋ,ृ" /> + </case> + <case latin:keyboardLayoutSet="nepali_traditional"> <!-- U+0913: "ओ" DEVANAGARI LETTER O --> <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" latin:moreKeys="ओ" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignVocalicR" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" /> </default> </switch> <!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R --> - <Key - latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" - latin:keyLabel="ृ" - latin:keyLabelFlags="fontNormal" /> + <key-style + latin:styleName="baseKeyDevanagariVowelSignVocalicR" + latin:parentStyle="moreKeysDevanagariVowelSignVocalicR" + latin:keySpec="ृ" /> </merge> |