aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-v16
diff options
context:
space:
mode:
Diffstat (limited to 'java/res/xml-v16')
-rw-r--r--java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml (renamed from java/res/xml-v16/key_devanagari_sign_anusvara.xml)31
-rw-r--r--java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml (renamed from java/res/xml-v16/key_devanagari_sign_candrabindu.xml)10
-rw-r--r--java/res/xml-v16/keystyle_devanagari_sign_nukta.xml (renamed from java/res/xml-v16/key_devanagari_sign_nukta.xml)15
-rw-r--r--java/res/xml-v16/keystyle_devanagari_sign_virama.xml25
-rw-r--r--java/res/xml-v16/keystyle_devanagari_sign_visarga.xml2
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml18
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml18
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml18
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml56
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml (renamed from java/res/xml-v16/key_devanagari_vowel_sign_candra_o.xml)28
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml18
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml18
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml18
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml20
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml18
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml18
-rw-r--r--java/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml (renamed from java/res/xml-v16/key_devanagari_vowel_sign_vocalic_r.xml)26
17 files changed, 330 insertions, 27 deletions
diff --git a/java/res/xml-v16/key_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
index 27c7bff5a..405aebc50 100644
--- a/java/res/xml-v16/key_devanagari_sign_anusvara.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
@@ -25,8 +25,35 @@
<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="&#x0903;,&#x0901;,&#x093C;" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
+ U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignAnusvara"
+ latin:moreKeys="&#x0903;,&#x0901;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariSignAnusvara" />
+ </default>
+ </switch>
<!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
- <Key
- latin:keyLabel="&#x0902;"
+ <key-style
+ latin:styleName="baseKeyDevanagariSignAnusvara"
+ latin:parentStyle="moreKeysDevanagariSignAnusvara"
+ latin:keySpec="&#x0902;"
latin:keyLabelFlags="fontNormal" />
</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..6198d01a9 100644
--- a/java/res/xml-v16/key_devanagari_sign_candrabindu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
@@ -29,8 +29,7 @@
<case
latin:keyboardLayoutSet="hindi"
>
- <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
+ <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
<key-style
latin:styleName="moreKeysDevanagariSignCandrabindu"
latin:moreKeys="&#x0945;" />
@@ -41,8 +40,9 @@
</default>
</switch>
<!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
- <Key
- latin:keyStyle="moreKeysDevanagariSignCandrabindu"
- latin:keyLabel="&#x0901;"
+ <key-style
+ latin:styleName="baseKeyDevanagariSignCandrabindu"
+ latin:parentStyle="moreKeysDevanagariSignCandrabindu"
+ latin:keySpec="&#x0901;"
latin:keyLabelFlags="fontNormal" />
</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..e0b47bb6f 100644
--- a/java/res/xml-v16/key_devanagari_sign_nukta.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_nukta.xml
@@ -36,14 +36,23 @@
latin:styleName="moreKeysDevanagariSignNukta"
latin:moreKeys="&#x097D;,&#x0970;,&#x093D;" />
</case>
+ <case
+ latin:keyboardLayoutSet="nepali_romanized"
+ >
+ <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignNukta"
+ latin:moreKeys="&#x093C;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariSignNukta" />
</default>
</switch>
<!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
- <Key
- latin:keyStyle="moreKeysDevanagariSignNukta"
- latin:keyLabel="&#x093C;"
+ <key-style
+ latin:styleName="baseKeyDevanagariSignNukta"
+ latin:parentStyle="moreKeysDevanagariSignNukta"
+ latin:keySpec="&#x093C;"
latin:keyLabelFlags="fontNormal" />
</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..73248e4c2 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_virama.xml
@@ -25,9 +25,32 @@
<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="&#x094D;" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0905: "अ" DEVANAGARI LETTER A -->
+ <key-style
+ latin:styleName="moreKeysDevanagariSignVirama"
+ latin:moreKeys="&#x0905;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariSignVirama" />
+ </default>
+ </switch>
<!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
<key-style
latin:styleName="baseKeyDevanagariSignVirama"
- latin:keyLabel="&#x094D;"
+ latin:parentStyle="moreKeysDevanagariSignVirama"
+ latin:keySpec="&#x094D;"
latin:keyLabelFlags="fontNormal" />
</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..b047893a6 100644
--- a/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
+++ b/java/res/xml-v16/keystyle_devanagari_sign_visarga.xml
@@ -28,6 +28,6 @@
<!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
<key-style
latin:styleName="baseKeyDevanagariSignVisarga"
- latin:keyLabel="&#x0903;"
+ latin:keySpec="&#x0903;"
latin:keyLabelFlags="fontNormal" />
</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..cd07999b5 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
@@ -35,6 +35,22 @@
latin:styleName="moreKeysDevanagariVowelSignAa"
latin:moreKeys="&#x093E;&#x0902;,&#x093E;&#x0901;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAa"
+ latin:moreKeys="&#x093E;,%" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAa"
+ latin:moreKeys="&#x0906;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignAa" />
@@ -44,6 +60,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignAa"
latin:parentStyle="moreKeysDevanagariVowelSignAa"
- latin:keyLabel="&#x093E;"
+ latin:keySpec="&#x093E;"
latin:keyLabelFlags="fontNormal" />
</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..75a49b19d 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
@@ -35,6 +35,22 @@
latin:moreKeys="&#x0948;&#x0902;,%" />
</case>
<case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAi"
+ latin:moreKeys="&#x0948;,%" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAi"
+ latin:moreKeys="&#x0910;,%" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
@@ -51,6 +67,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignAi"
latin:parentStyle="moreKeysDevanagariVowelSignAi"
- latin:keyLabel="&#x0948;"
+ latin:keySpec="&#x0948;"
latin:keyLabelFlags="fontNormal" />
</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..26f1aca5a 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
@@ -34,6 +34,22 @@
latin:styleName="moreKeysDevanagariVowelSignAu"
latin:moreKeys="&#x094C;&#x0902;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAu"
+ latin:moreKeys="&#x094C;,%" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignAu"
+ latin:moreKeys="&#x0914;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignAu" />
@@ -43,6 +59,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignAu"
latin:parentStyle="moreKeysDevanagariVowelSignAu"
- latin:keyLabel="&#x094C;"
+ latin:keySpec="&#x094C;"
latin:keyLabelFlags="fontNormal" />
</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..ec056a380
--- /dev/null
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -0,0 +1,56 @@
+<?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="&#x0945;" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraE"
+ latin:moreKeys="&#x090D;" />
+ </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="&#x0945;"
+ latin:keyLabelFlags="fontNormal" />
+</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..fb4d4eb17 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
@@ -25,8 +25,32 @@
<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="&#x0949;" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraO"
+ latin:moreKeys="&#x0911;" />
+ </case>
+ <default>
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignCandraO" />
+ </default>
+ </switch>
<!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
- <Key
- latin:keyLabel="&#x0949;"
+ <key-style
+ latin:styleName="baseKeyDevanagariVowelSignCandraO"
+ latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
+ latin:keySpec="&#x0949;"
latin:keyLabelFlags="fontNormal" />
</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..965bccbd2 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
@@ -35,6 +35,22 @@
latin:moreKeys="&#x0947;&#x0902;" />
</case>
<case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignE"
+ latin:moreKeys="&#x0947;" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignE"
+ latin:moreKeys="&#x090F;" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
@@ -52,6 +68,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignE"
latin:parentStyle="moreKeysDevanagariVowelSignE"
- latin:keyLabel="&#x0947;"
+ latin:keySpec="&#x0947;"
latin:keyLabelFlags="fontNormal" />
</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..ec71c4dcd 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
@@ -34,6 +34,22 @@
latin:styleName="moreKeysDevanagariVowelSignI"
latin:moreKeys="&#x093F;&#x0902;" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignI"
+ latin:moreKeys="&#x093F;" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0907: "इ" DEVANAGARI LETTER I -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignI"
+ latin:moreKeys="&#x0907;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignI" />
@@ -43,6 +59,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignI"
latin:parentStyle="moreKeysDevanagariVowelSignI"
- latin:keyLabel="&#x093F;"
+ latin:keySpec="&#x093F;"
latin:keyLabelFlags="fontNormal" />
</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..9a9f9158c 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
@@ -34,6 +34,22 @@
latin:styleName="moreKeysDevanagariVowelSignIi"
latin:moreKeys="&#x0940;&#x0902;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignIi"
+ latin:moreKeys="&#x0940;,%" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0908: "ई" DEVANAGARI LETTER II -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignIi"
+ latin:moreKeys="&#x0908;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignIi" />
@@ -43,6 +59,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignIi"
latin:parentStyle="moreKeysDevanagariVowelSignIi"
- latin:keyLabel="&#x0940;"
+ latin:keySpec="&#x0940;"
latin:keyLabelFlags="fontNormal" />
</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..77389c22d 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
@@ -29,13 +29,29 @@
<case
latin:keyboardLayoutSet="hindi"
>
- <!-- U+094B/U+0902: "қं" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
+ <!-- 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="&#x094B;&#x0902;,&#x0949;,&#x094A;" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignO"
+ latin:moreKeys="&#x094B;" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignO"
+ latin:moreKeys="&#x0913;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignO" />
@@ -45,6 +61,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignO"
latin:parentStyle="moreKeysDevanagariVowelSignO"
- latin:keyLabel="&#x094B;"
+ latin:keySpec="&#x094B;"
latin:keyLabelFlags="fontNormal" />
</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..e2167bf24 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
@@ -35,6 +35,22 @@
latin:styleName="moreKeysDevanagariVowelSignU"
latin:moreKeys="&#x0941;&#x0902;,&#x0941;&#x0901;" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignU"
+ latin:moreKeys="&#x0941;" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+0909: "उ" DEVANAGARI LETTER U -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignU"
+ latin:moreKeys="&#x0909;" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignU" />
@@ -44,6 +60,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignU"
latin:parentStyle="moreKeysDevanagariVowelSignU"
- latin:keyLabel="&#x0941;"
+ latin:keySpec="&#x0941;"
latin:keyLabelFlags="fontNormal" />
</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..745236816 100644
--- a/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
@@ -35,6 +35,22 @@
latin:styleName="moreKeysDevanagariVowelSignUu"
latin:moreKeys="&#x0942;&#x0902;,&#x0942;&#x0901;,%" />
</case>
+ <case
+ latin:keyboardLayoutSet="hindi_compact"
+ >
+ <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignUu"
+ latin:moreKeys="&#x0942;,%" />
+ </case>
+ <case
+ latin:keyboardLayoutSet="marathi"
+ >
+ <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
+ <key-style
+ latin:styleName="moreKeysDevanagariVowelSignUu"
+ latin:moreKeys="&#x090A;,%" />
+ </case>
<default>
<key-style
latin:styleName="moreKeysDevanagariVowelSignUu" />
@@ -44,6 +60,6 @@
<key-style
latin:styleName="baseKeyDevanagariVowelSignUu"
latin:parentStyle="moreKeysDevanagariVowelSignUu"
- latin:keyLabel="&#x0942;"
+ latin:keySpec="&#x0942;"
latin:keyLabelFlags="fontNormal" />
</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..9c930d348 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
@@ -35,6 +35,25 @@
latin:moreKeys="&#x0944;" />
</case>
<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="&#x090B;,&#x0943;" />
+ </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="&#x0931;,&#x090B;,&#x0943;" />
+ </case>
+ <case
latin:keyboardLayoutSet="nepali_traditional"
>
<!-- U+0913: "ओ" DEVANAGARI LETTER O -->
@@ -48,8 +67,9 @@
</default>
</switch>
<!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
- <Key
- latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
- latin:keyLabel="&#x0943;"
+ <key-style
+ latin:styleName="baseKeyDevanagariVowelSignVocalicR"
+ latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
+ latin:keySpec="&#x0943;"
latin:keyLabelFlags="fontNormal" />
</merge>