diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-07 16:33:06 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-07-07 18:58:01 +0900 |
| commit | 92ac2aa8ed3ad889f5a31336900e3c46264df97d (patch) | |
| tree | 9cc9e15d895065c67cac7c1c566e59f57d430a59 /java/res/xml-v16 | |
| parent | b1807d0bc75fd4191a9cd45c03a777ee8e650686 (diff) | |
| download | latinime-92ac2aa8ed3ad889f5a31336900e3c46264df97d.tar.gz latinime-92ac2aa8ed3ad889f5a31336900e3c46264df97d.tar.xz latinime-92ac2aa8ed3ad889f5a31336900e3c46264df97d.zip | |
Move fontNormal flag from Key to Row
Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47
Diffstat (limited to 'java/res/xml-v16')
17 files changed, 96 insertions, 251 deletions
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml index 405aebc50..d5491d29d 100644 --- a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml +++ b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml @@ -22,13 +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"> <switch> - <case - latin:keyboardLayoutSet="hindi_compact" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU U+093C: "़" DEVANAGARI SIGN NUKTA --> @@ -36,9 +32,7 @@ latin:styleName="moreKeysDevanagariSignAnusvara" latin:moreKeys="ः,ँ,़" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <case latin:keyboardLayoutSet="marathi"> <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU --> <key-style @@ -46,14 +40,12 @@ latin:moreKeys="ः,ँ" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariSignAnusvara" /> + <key-style latin:styleName="moreKeysDevanagariSignAnusvara" /> </default> </switch> <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA --> <key-style latin:styleName="baseKeyDevanagariSignAnusvara" latin:parentStyle="moreKeysDevanagariSignAnusvara" - latin:keySpec="ं" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ं" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml index 6198d01a9..ef8dec37c 100644 --- a/java/res/xml-v16/keystyle_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" - > + <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-style latin:styleName="baseKeyDevanagariSignCandrabindu" latin:parentStyle="moreKeysDevanagariSignCandrabindu" - latin:keySpec="ँ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ँ" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml index e0b47bb6f..734d0600a 100644 --- a/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml +++ b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml @@ -22,37 +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" - > + <case latin:keyboardLayoutSet="nepali_romanized"> <!-- U+093C: "़" DEVANAGARI SIGN NUKTA --> - <key-style + <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-style latin:styleName="baseKeyDevanagariSignNukta" latin:parentStyle="moreKeysDevanagariSignNukta" - latin:keySpec="़" - latin:keyLabelFlags="fontNormal" /> + 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 73248e4c2..0300e4a8b 100644 --- a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml +++ b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml @@ -22,35 +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" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA --> <key-style latin:styleName="moreKeysDevanagariSignVirama" latin:moreKeys="्" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <case latin:keyboardLayoutSet="marathi"> <!-- U+0905: "अ" DEVANAGARI LETTER A --> <key-style latin:styleName="moreKeysDevanagariSignVirama" latin:moreKeys="अ" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariSignVirama" /> + <key-style latin:styleName="moreKeysDevanagariSignVirama" /> </default> </switch> <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA --> <key-style latin:styleName="baseKeyDevanagariSignVirama" latin:parentStyle="moreKeysDevanagariSignVirama" - latin:keySpec="्" - latin:keyLabelFlags="fontNormal" /> + 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 b047893a6..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:keySpec="ः" - 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 cd07999b5..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,44 +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> - <case - latin:keyboardLayoutSet="hindi_compact" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA --> <key-style latin:styleName="moreKeysDevanagariVowelSignAa" latin:moreKeys="ा,%" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <case latin:keyboardLayoutSet="marathi"> <!-- U+0906: "आ" DEVANAGARI LETTER AA --> <key-style latin:styleName="moreKeysDevanagariVowelSignAa" latin:moreKeys="आ,%" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignAa" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignAa" /> </default> </switch> <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA --> <key-style latin:styleName="baseKeyDevanagariVowelSignAa" latin:parentStyle="moreKeysDevanagariVowelSignAa" - latin:keySpec="ा" - 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 75a49b19d..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,51 +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="hindi_compact" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI --> <key-style latin:styleName="moreKeysDevanagariVowelSignAi" latin:moreKeys="ै,%" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <case latin:keyboardLayoutSet="marathi"> <!-- U+0910: "ऐ" DEVANAGARI LETTER AI --> <key-style latin:styleName="moreKeysDevanagariVowelSignAi" latin:moreKeys="ऐ,%" /> </case> - <case - latin:keyboardLayoutSet="nepali_traditional" - > + <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:keySpec="ै" - 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 26f1aca5a..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,43 +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" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU --> <key-style latin:styleName="moreKeysDevanagariVowelSignAu" latin:moreKeys="ौ,%" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <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:keySpec="ौ" - 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 index ec056a380..75ad44f34 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml @@ -22,35 +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" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E --> <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" latin:moreKeys="ॅ" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <case latin:keyboardLayoutSet="marathi"> <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E --> <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" latin:moreKeys="ऍ" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignCandraE" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" /> </default> </switch> <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E --> <key-style latin:styleName="baseKeyDevanagariVowelSignCandraE" latin:parentStyle="moreKeysDevanagariVowelSignCandraE" - latin:keySpec="ॅ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ॅ" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml index fb4d4eb17..e1a4c613c 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml @@ -22,35 +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" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O --> <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" latin:moreKeys="ॉ" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <case latin:keyboardLayoutSet="marathi"> <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O --> <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" latin:moreKeys="ऑ" /> </case> <default> - <key-style - latin:styleName="moreKeysDevanagariVowelSignCandraO" /> + <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" /> </default> </switch> <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O --> <key-style latin:styleName="baseKeyDevanagariVowelSignCandraO" latin:parentStyle="moreKeysDevanagariVowelSignCandraO" - latin:keySpec="ॉ" - latin:keyLabelFlags="fontNormal" /> + 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 965bccbd2..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,37 +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="hindi_compact" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E --> <key-style latin:styleName="moreKeysDevanagariVowelSignE" latin:moreKeys="े" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <case latin:keyboardLayoutSet="marathi"> <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E --> <key-style latin:styleName="moreKeysDevanagariVowelSignE" latin:moreKeys="ए" /> </case> - <case - latin:keyboardLayoutSet="nepali_traditional" - > + <case latin:keyboardLayoutSet="nepali_traditional"> <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> <key-style @@ -60,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:keySpec="े" - 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 ec71c4dcd..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,43 +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" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I --> <key-style latin:styleName="moreKeysDevanagariVowelSignI" latin:moreKeys="ि" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <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:keySpec="ि" - 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 9a9f9158c..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,43 +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" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II --> <key-style latin:styleName="moreKeysDevanagariVowelSignIi" latin:moreKeys="ी,%" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <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:keySpec="ी" - 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 77389c22d..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,13 +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"> <switch> - <case - latin:keyboardLayoutSet="hindi" - > + <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 --> @@ -36,31 +32,25 @@ latin:styleName="moreKeysDevanagariVowelSignO" latin:moreKeys="ों,ॉ,ॊ" /> </case> - <case - latin:keyboardLayoutSet="hindi_compact" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O --> <key-style latin:styleName="moreKeysDevanagariVowelSignO" latin:moreKeys="ो" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <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:keySpec="ो" - 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 e2167bf24..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,44 +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" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U --> <key-style latin:styleName="moreKeysDevanagariVowelSignU" latin:moreKeys="ु" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <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:keySpec="ु" - 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 745236816..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,44 +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" - > + <case latin:keyboardLayoutSet="hindi_compact"> <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU --> <key-style latin:styleName="moreKeysDevanagariVowelSignUu" latin:moreKeys="ू,%" /> </case> - <case - latin:keyboardLayoutSet="marathi" - > + <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:keySpec="ू" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ू" /> </merge> diff --git a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml index 9c930d348..da510c1f5 100644 --- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml +++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml @@ -22,30 +22,22 @@ 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="hindi_compact" - > + <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" - > + <case latin:keyboardLayoutSet="marathi"> <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R --> @@ -53,23 +45,19 @@ latin:styleName="moreKeysDevanagariVowelSignVocalicR" latin:moreKeys="ऱ,ऋ,ृ" /> </case> - <case - latin:keyboardLayoutSet="nepali_traditional" - > + <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-style latin:styleName="baseKeyDevanagariVowelSignVocalicR" latin:parentStyle="moreKeysDevanagariVowelSignVocalicR" - latin:keySpec="ृ" - latin:keyLabelFlags="fontNormal" /> + latin:keySpec="ृ" /> </merge> |