From 92ac2aa8ed3ad889f5a31336900e3c46264df97d Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 7 Jul 2014 16:33:06 +0900
Subject: [PATCH] Move fontNormal flag from Key to Row
Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47
---
java/res/xml-sw600dp/keys_arabic3_left.xml | 6 +-
java/res/xml-sw600dp/keys_farsi3_right.xml | 6 +-
java/res/xml-sw600dp/rows_arabic.xml | 22 ++--
.../xml-sw600dp/rows_armenian_phonetic.xml | 37 +++----
java/res/xml-sw600dp/rows_bengali.xml | 25 ++---
java/res/xml-sw600dp/rows_farsi.xml | 19 ++--
java/res/xml-sw600dp/rows_hindi.xml | 25 ++---
java/res/xml-sw600dp/rows_hindi_compact.xml | 25 ++---
java/res/xml-sw600dp/rows_khmer.xml | 35 +++---
java/res/xml-sw600dp/rows_lao.xml | 35 +++---
java/res/xml-sw600dp/rows_marathi.xml | 25 ++---
java/res/xml-sw600dp/rows_myanmar.xml | 31 +++---
.../res/xml-sw600dp/rows_nepali_romanized.xml | 25 ++---
.../xml-sw600dp/rows_nepali_traditional.xml | 27 ++---
java/res/xml-sw600dp/rows_sinhala.xml | 22 ++--
java/res/xml-sw600dp/rows_thai.xml | 32 +++---
.../keystyle_devanagari_sign_anusvara.xml | 18 +--
.../keystyle_devanagari_sign_candrabindu.xml | 14 +--
.../keystyle_devanagari_sign_nukta.xml | 22 ++--
.../keystyle_devanagari_sign_virama.xml | 18 +--
.../keystyle_devanagari_sign_visarga.xml | 7 +-
.../keystyle_devanagari_vowel_sign_aa.xml | 22 +---
.../keystyle_devanagari_vowel_sign_ai.xml | 26 ++---
.../keystyle_devanagari_vowel_sign_au.xml | 22 +---
...eystyle_devanagari_vowel_sign_candra_e.xml | 18 +--
...eystyle_devanagari_vowel_sign_candra_o.xml | 18 +--
.../keystyle_devanagari_vowel_sign_e.xml | 26 ++---
.../keystyle_devanagari_vowel_sign_i.xml | 22 +---
.../keystyle_devanagari_vowel_sign_ii.xml | 22 +---
.../keystyle_devanagari_vowel_sign_o.xml | 22 +---
.../keystyle_devanagari_vowel_sign_u.xml | 22 +---
.../keystyle_devanagari_vowel_sign_uu.xml | 22 +---
...ystyle_devanagari_vowel_sign_vocalic_r.xml | 26 ++---
java/res/xml/key_armenian_sha.xml | 3 +-
java/res/xml/key_armenian_xeh.xml | 3 +-
java/res/xml/key_thai_kho_khuat.xml | 6 +-
java/res/xml/keys_arabic3_left.xml | 3 +-
java/res/xml/keys_farsi3_right.xml | 3 +-
.../xml/keystyle_devanagari_sign_anusvara.xml | 17 +--
.../keystyle_devanagari_sign_candrabindu.xml | 13 +--
.../xml/keystyle_devanagari_sign_nukta.xml | 21 ++--
.../xml/keystyle_devanagari_sign_virama.xml | 19 +---
.../xml/keystyle_devanagari_sign_visarga.xml | 6 +-
.../xml/keystyle_devanagari_vowel_sign_aa.xml | 21 +---
.../xml/keystyle_devanagari_vowel_sign_ai.xml | 25 ++---
.../xml/keystyle_devanagari_vowel_sign_au.xml | 21 +---
...eystyle_devanagari_vowel_sign_candra_e.xml | 17 +--
...eystyle_devanagari_vowel_sign_candra_o.xml | 17 +--
.../xml/keystyle_devanagari_vowel_sign_e.xml | 25 ++---
.../xml/keystyle_devanagari_vowel_sign_i.xml | 21 +---
.../xml/keystyle_devanagari_vowel_sign_ii.xml | 21 +---
.../xml/keystyle_devanagari_vowel_sign_o.xml | 21 +---
.../xml/keystyle_devanagari_vowel_sign_u.xml | 21 +---
.../xml/keystyle_devanagari_vowel_sign_uu.xml | 21 +---
...ystyle_devanagari_vowel_sign_vocalic_r.xml | 25 ++---
java/res/xml/rowkeys_arabic1.xml | 37 ++-----
java/res/xml/rowkeys_arabic2.xml | 42 ++-----
java/res/xml/rowkeys_arabic3.xml | 41 ++-----
java/res/xml/rowkeys_armenian_phonetic1.xml | 34 ++----
java/res/xml/rowkeys_armenian_phonetic2.xml | 43 ++------
java/res/xml/rowkeys_armenian_phonetic3.xml | 40 ++-----
java/res/xml/rowkeys_armenian_phonetic4.xml | 32 ++----
java/res/xml/rowkeys_bengali1.xml | 37 ++-----
java/res/xml/rowkeys_bengali2.xml | 37 ++-----
java/res/xml/rowkeys_bengali3.xml | 36 ++----
java/res/xml/rowkeys_farsi1.xml | 38 ++-----
java/res/xml/rowkeys_farsi2.xml | 44 ++------
java/res/xml/rowkeys_farsi3.xml | 42 ++-----
java/res/xml/rowkeys_hindi1.xml | 83 +++++---------
java/res/xml/rowkeys_hindi2.xml | 97 +++++-----------
java/res/xml/rowkeys_hindi3.xml | 84 +++++---------
java/res/xml/rowkeys_hindi_compact1.xml | 52 +++------
java/res/xml/rowkeys_hindi_compact2.xml | 55 +++------
java/res/xml/rowkeys_hindi_compact3.xml | 45 +++-----
java/res/xml/rowkeys_khmer1.xml | 81 ++++++--------
java/res/xml/rowkeys_khmer2.xml | 100 +++++------------
java/res/xml/rowkeys_khmer3.xml | 97 +++++-----------
java/res/xml/rowkeys_khmer4.xml | 80 ++++----------
java/res/xml/rowkeys_lao1.xml | 93 +++++-----------
java/res/xml/rowkeys_lao2.xml | 90 +++++----------
java/res/xml/rowkeys_lao3.xml | 92 ++++++----------
java/res/xml/rowkeys_lao4.xml | 80 +++++---------
java/res/xml/rowkeys_marathi1.xml | 37 ++-----
java/res/xml/rowkeys_marathi2.xml | 55 +++------
java/res/xml/rowkeys_marathi3.xml | 45 +++-----
java/res/xml/rowkeys_myanmar1.xml | 72 ++++--------
java/res/xml/rowkeys_myanmar2.xml | 88 ++++-----------
java/res/xml/rowkeys_myanmar3.xml | 81 ++++----------
java/res/xml/rowkeys_myanmar4.xml | 67 +++--------
java/res/xml/rowkeys_nepali_romanized1.xml | 99 +++++------------
java/res/xml/rowkeys_nepali_romanized2.xml | 102 +++++------------
java/res/xml/rowkeys_nepali_romanized3.xml | 87 ++++-----------
java/res/xml/rowkeys_nepali_traditional1.xml | 73 +++++-------
java/res/xml/rowkeys_nepali_traditional2.xml | 104 ++++++------------
.../xml/rowkeys_nepali_traditional3_left6.xml | 52 +++------
.../rowkeys_nepali_traditional3_right3.xml | 39 ++-----
.../rowkeys_nepali_traditional3_right5.xml | 51 +++------
java/res/xml/rowkeys_sinhala1.xml | 40 +++----
java/res/xml/rowkeys_sinhala2.xml | 76 +++++--------
java/res/xml/rowkeys_sinhala3.xml | 52 +++------
java/res/xml/rowkeys_thai1.xml | 88 +++++----------
java/res/xml/rowkeys_thai2.xml | 93 +++++-----------
java/res/xml/rowkeys_thai3.xml | 87 +++++----------
java/res/xml/rowkeys_thai4.xml | 77 +++++--------
java/res/xml/rows_arabic.xml | 22 ++--
java/res/xml/rows_armenian_phonetic.xml | 35 +++---
java/res/xml/rows_bengali.xml | 24 ++--
java/res/xml/rows_farsi.xml | 22 ++--
java/res/xml/rows_hindi.xml | 24 ++--
java/res/xml/rows_hindi_compact.xml | 24 ++--
java/res/xml/rows_khmer.xml | 32 +++---
java/res/xml/rows_lao.xml | 32 +++---
java/res/xml/rows_marathi.xml | 26 ++---
java/res/xml/rows_myanmar.xml | 34 +++---
java/res/xml/rows_nepali_romanized.xml | 24 ++--
java/res/xml/rows_nepali_traditional.xml | 30 ++---
java/res/xml/rows_sinhala.xml | 19 +---
java/res/xml/rows_thai.xml | 35 +++---
118 files changed, 1484 insertions(+), 3190 deletions(-)
diff --git a/java/res/xml-sw600dp/keys_arabic3_left.xml b/java/res/xml-sw600dp/keys_arabic3_left.xml
index 9b4031e558..87ca1055ed 100644
--- a/java/res/xml-sw600dp/keys_arabic3_left.xml
+++ b/java/res/xml-sw600dp/keys_arabic3_left.xml
@@ -23,10 +23,8 @@
>
<!-- U+0630: "Ø°" ARABIC LETTER THAL -->
<Key
- latin:keySpec="ذ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="ذ" />
<!-- U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
<Key
- latin:keySpec="ئ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="ئ" />
</merge>
diff --git a/java/res/xml-sw600dp/keys_farsi3_right.xml b/java/res/xml-sw600dp/keys_farsi3_right.xml
index 45d1286289..c832d55429 100644
--- a/java/res/xml-sw600dp/keys_farsi3_right.xml
+++ b/java/res/xml-sw600dp/keys_farsi3_right.xml
@@ -23,10 +23,8 @@
>
<!-- U+0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
- latin:keySpec="آ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="آ" />
<!-- U+0686: "Ú†" ARABIC LETTER TCHEH -->
<Key
- latin:keySpec="چ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="چ" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_arabic.xml b/java/res/xml-sw600dp/rows_arabic.xml
index 5a28d45724..1b7b4161e8 100644
--- a/java/res/xml-sw600dp/rows_arabic.xml
+++ b/java/res/xml-sw600dp/rows_arabic.xml
@@ -18,35 +18,31 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_arabic1" />
+ <include latin:keyboardLayout="@xml/rowkeys_arabic1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_arabic2" />
+ <include latin:keyboardLayout="@xml/rowkeys_arabic2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_arabic3" />
+ <include latin:keyboardLayout="@xml/rowkeys_arabic3" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_armenian_phonetic.xml b/java/res/xml-sw600dp/rows_armenian_phonetic.xml
index 9bc2a18210..ebd16cba08 100644
--- a/java/res/xml-sw600dp/rows_armenian_phonetic.xml
+++ b/java/res/xml-sw600dp/rows_armenian_phonetic.xml
@@ -18,53 +18,46 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.0%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
+ <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
- </Row>
+ </Row>
<Row
latin:keyWidth="9.0%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
- <include
- latin:keyboardLayout="@xml/key_armenian_xeh" />
+ <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
+ <include latin:keyboardLayout="@xml/key_armenian_xeh" />
</Row>
<Row
latin:keyWidth="9.0%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
- <include
- latin:keyboardLayout="@xml/key_armenian_sha" />
+ <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
+ <include latin:keyboardLayout="@xml/key_armenian_sha" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.8889%p"
+ latin:keyLabelFlags="fontNormal"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_bengali.xml b/java/res/xml-sw600dp/rows_bengali.xml
index b1e787849f..10b3e4fb57 100644
--- a/java/res/xml-sw600dp/rows_bengali.xml
+++ b/java/res/xml-sw600dp/rows_bengali.xml
@@ -18,37 +18,32 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_bengali1" />
+ <include latin:keyboardLayout="@xml/rowkeys_bengali1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_bengali2" />
+ <include latin:keyboardLayout="@xml/rowkeys_bengali2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_bengali3" />
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/rowkeys_bengali3" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml
index a353b67c76..1d098df9a5 100644
--- a/java/res/xml-sw600dp/rows_farsi.xml
+++ b/java/res/xml-sw600dp/rows_farsi.xml
@@ -18,36 +18,33 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_farsi1" />
+ <include latin:keyboardLayout="@xml/rowkeys_farsi1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_farsi2" />
+ <include latin:keyboardLayout="@xml/rowkeys_farsi2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
<include
latin:keyboardLayout="@xml/rowkeys_farsi3"
latin:keyXPos="4.091%p" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml
index ca581be140..42b92a72a1 100644
--- a/java/res/xml-sw600dp/rows_hindi.xml
+++ b/java/res/xml-sw600dp/rows_hindi.xml
@@ -18,40 +18,35 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi1" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi2" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi3" />
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi3" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_hindi_compact.xml b/java/res/xml-sw600dp/rows_hindi_compact.xml
index ac476eb3bd..6493451693 100644
--- a/java/res/xml-sw600dp/rows_hindi_compact.xml
+++ b/java/res/xml-sw600dp/rows_hindi_compact.xml
@@ -18,37 +18,32 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_khmer.xml b/java/res/xml-sw600dp/rows_khmer.xml
index 2824a5c2f5..800a3ee571 100644
--- a/java/res/xml-sw600dp/rows_khmer.xml
+++ b/java/res/xml-sw600dp/rows_khmer.xml
@@ -18,55 +18,48 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_khmer1" />
+ <include latin:keyboardLayout="@xml/rowkeys_khmer1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
- </Row>
+ </Row>
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_khmer2" />
+ <include latin:keyboardLayout="@xml/rowkeys_khmer2" />
</Row>
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_khmer3" />
+ <include latin:keyboardLayout="@xml/rowkeys_khmer3" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_khmer4" />
+ <include latin:keyboardLayout="@xml/rowkeys_khmer4" />
<switch>
- <case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Spacer />
</case>
<default>
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
</default>
</switch>
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_lao.xml b/java/res/xml-sw600dp/rows_lao.xml
index 446d9bd5ae..264e2d9ed2 100644
--- a/java/res/xml-sw600dp/rows_lao.xml
+++ b/java/res/xml-sw600dp/rows_lao.xml
@@ -18,55 +18,48 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_lao1" />
+ <include latin:keyboardLayout="@xml/rowkeys_lao1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
- </Row>
+ </Row>
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_lao2" />
+ <include latin:keyboardLayout="@xml/rowkeys_lao2" />
</Row>
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_lao3" />
+ <include latin:keyboardLayout="@xml/rowkeys_lao3" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_lao4" />
+ <include latin:keyboardLayout="@xml/rowkeys_lao4" />
<switch>
- <case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Spacer />
</case>
<default>
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
</default>
</switch>
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_marathi.xml b/java/res/xml-sw600dp/rows_marathi.xml
index 51dc7a2b98..c77bea5671 100644
--- a/java/res/xml-sw600dp/rows_marathi.xml
+++ b/java/res/xml-sw600dp/rows_marathi.xml
@@ -18,37 +18,32 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_marathi1" />
+ <include latin:keyboardLayout="@xml/rowkeys_marathi1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_marathi2" />
+ <include latin:keyboardLayout="@xml/rowkeys_marathi2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_marathi3" />
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/rowkeys_marathi3" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_myanmar.xml b/java/res/xml-sw600dp/rows_myanmar.xml
index 8eedf9d2f5..20d9d8ab23 100644
--- a/java/res/xml-sw600dp/rows_myanmar.xml
+++ b/java/res/xml-sw600dp/rows_myanmar.xml
@@ -18,46 +18,41 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.0%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_myanmar1" />
+ <include latin:keyboardLayout="@xml/rowkeys_myanmar1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
- </Row>
+ </Row>
<Row
latin:keyWidth="9.0%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_myanmar2" />
+ <include latin:keyboardLayout="@xml/rowkeys_myanmar2" />
</Row>
<Row
latin:keyWidth="9.0%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_myanmar3" />
+ <include latin:keyboardLayout="@xml/rowkeys_myanmar3" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="9.0%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_myanmar4" />
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/rowkeys_myanmar4" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_nepali_romanized.xml b/java/res/xml-sw600dp/rows_nepali_romanized.xml
index 21d1dc6e03..fe73fbd9ea 100644
--- a/java/res/xml-sw600dp/rows_nepali_romanized.xml
+++ b/java/res/xml-sw600dp/rows_nepali_romanized.xml
@@ -18,40 +18,35 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_nepali_traditional.xml b/java/res/xml-sw600dp/rows_nepali_traditional.xml
index 90703da766..e56271f21c 100644
--- a/java/res/xml-sw600dp/rows_nepali_traditional.xml
+++ b/java/res/xml-sw600dp/rows_nepali_traditional.xml
@@ -18,40 +18,35 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
</Row>
<Row
latin:keyWidth="8.182%p"
+ latin:keyLabelFlags="fontNormal"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" />
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right5" />
- </Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_left6" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right5" />
+ </Row>
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_sinhala.xml b/java/res/xml-sw600dp/rows_sinhala.xml
index d3a5ca5359..2786028207 100644
--- a/java/res/xml-sw600dp/rows_sinhala.xml
+++ b/java/res/xml-sw600dp/rows_sinhala.xml
@@ -18,17 +18,13 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.182%p"
latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_sinhala1" />
+ <include latin:keyboardLayout="@xml/rowkeys_sinhala1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
@@ -37,8 +33,7 @@
latin:keyWidth="8.182%p"
latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_sinhala2" />
+ <include latin:keyboardLayout="@xml/rowkeys_sinhala2" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
@@ -50,11 +45,8 @@
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_sinhala3" />
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/rowkeys_sinhala3" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_thai.xml b/java/res/xml-sw600dp/rows_thai.xml
index 7738c7f047..2006056a46 100644
--- a/java/res/xml-sw600dp/rows_thai.xml
+++ b/java/res/xml-sw600dp/rows_thai.xml
@@ -18,31 +18,29 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_thai1" />
+ <include latin:keyboardLayout="@xml/rowkeys_thai1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
- </Row>
+ </Row>
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal"
>
<include
latin:keyboardLayout="@xml/rowkeys_thai2"
latin:keyXPos="2.5%p" />
- <include
- latin:keyboardLayout="@xml/key_thai_kho_khuat" />
+ <include latin:keyboardLayout="@xml/key_thai_kho_khuat" />
</Row>
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal"
>
<include
latin:keyboardLayout="@xml/rowkeys_thai3"
@@ -53,24 +51,20 @@
</Row>
<Row
latin:keyWidth="7.5%p"
+ latin:keyLabelFlags="fontNormal"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_thai4" />
+ <include latin:keyboardLayout="@xml/rowkeys_thai4" />
<switch>
- <case
- latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Spacer />
</case>
<default>
- <include
- latin:keyboardLayout="@xml/keys_exclamation_question" />
+ <include latin:keyboardLayout="@xml/keys_exclamation_question" />
</default>
</switch>
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/java/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
index 405aebc505..d5491d29d9 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 6198d01a92..ef8dec37cf 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 e0b47bb6f2..734d0600a3 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 73248e4c2e..0300e4a8b2 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 b047893a64..ea64a1009f 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 cd07999b57..1e638507ac 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 75a49b19df..acb2894062 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 26f1aca5a5..e2c367784f 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 ec056a3804..75ad44f34c 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 fb4d4eb17e..e1a4c613c2 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 965bccbd29..6a99eace0a 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 ec71c4dcdd..b66149d28c 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 9a9f9158c2..97e5007139 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 77389c22d0..7cec76d434 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 e2167bf248..c14f920bc2 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 745236816a..3134de7c87 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 9c930d348d..da510c1f56 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>
diff --git a/java/res/xml/key_armenian_sha.xml b/java/res/xml/key_armenian_sha.xml
index b6418f26f0..111d4263b7 100644
--- a/java/res/xml/key_armenian_sha.xml
+++ b/java/res/xml/key_armenian_sha.xml
@@ -23,6 +23,5 @@
>
<!-- U+0577: "Õ·" ARMENIAN SMALL LETTER SHA -->
<Key
- latin:keySpec="շ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="շ" />
</merge>
diff --git a/java/res/xml/key_armenian_xeh.xml b/java/res/xml/key_armenian_xeh.xml
index cfc5bc0f9e..3bbc405dc7 100644
--- a/java/res/xml/key_armenian_xeh.xml
+++ b/java/res/xml/key_armenian_xeh.xml
@@ -23,6 +23,5 @@
>
<!-- U+056D: "Õ" ARMENIAN SMALL LETTER XEH -->
<Key
- latin:keySpec="խ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="խ" />
</merge>
diff --git a/java/res/xml/key_thai_kho_khuat.xml b/java/res/xml/key_thai_kho_khuat.xml
index 84988f870c..a43a87ccdc 100644
--- a/java/res/xml/key_thai_kho_khuat.xml
+++ b/java/res/xml/key_thai_kho_khuat.xml
@@ -27,14 +27,12 @@
>
<!-- U+0E05: "ฅ" THAI CHARACTER KHO KHON -->
<Key
- latin:keySpec="ฅ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="ฅ" />
</case>
<default>
<!-- U+0E03: "ฃ" THAI CHARACTER KHO KHUAT -->
<Key
- latin:keySpec="ฃ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="ฃ" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/keys_arabic3_left.xml b/java/res/xml/keys_arabic3_left.xml
index 2b3e12c030..05ba6d8f3a 100644
--- a/java/res/xml/keys_arabic3_left.xml
+++ b/java/res/xml/keys_arabic3_left.xml
@@ -23,6 +23,5 @@
>
<!-- U+0630: "Ø°" ARABIC LETTER THAL -->
<Key
- latin:keySpec="ذ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="ذ" />
</merge>
diff --git a/java/res/xml/keys_farsi3_right.xml b/java/res/xml/keys_farsi3_right.xml
index 2618e478c6..867c021437 100644
--- a/java/res/xml/keys_farsi3_right.xml
+++ b/java/res/xml/keys_farsi3_right.xml
@@ -23,6 +23,5 @@
>
<!-- U+0686: "Ú†" ARABIC LETTER TCHEH -->
<Key
- latin:keySpec="چ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="چ" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_anusvara.xml b/java/res/xml/keystyle_devanagari_sign_anusvara.xml
index a7e421d174..2517ac5625 100644
--- a/java/res/xml/keystyle_devanagari_sign_anusvara.xml
+++ b/java/res/xml/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+25CC: "◌" DOTTED CIRCLE
U+0903: "ःâ€" DEVANAGARI SIGN VISARGA
U+0901: "à¤" DEVANAGARI SIGN CANDRABINDU
@@ -37,9 +33,7 @@
latin:styleName="moreKeysDevanagariSignAnusvara"
latin:moreKeys="◌ः|ः,◌ँ|ँ,◌़|़" />
</case>
- <case
- latin:keyboardLayoutSet="marathi"
- >
+ <case latin:keyboardLayoutSet="marathi">
<!-- U+25CC: "◌" DOTTED CIRCLE
U+0903: "ःâ€" DEVANAGARI SIGN VISARGA
U+0901: "à¤" DEVANAGARI SIGN CANDRABINDU -->
@@ -48,8 +42,7 @@
latin:moreKeys="◌ः|ः,◌ँ|ँ" />
</case>
<default>
- <key-style
- latin:styleName="moreKeysDevanagariSignAnusvara" />
+ <key-style latin:styleName="moreKeysDevanagariSignAnusvara" />
</default>
</switch>
<!-- U+25CC: "◌" DOTTED CIRCLE
@@ -58,5 +51,5 @@
latin:styleName="baseKeyDevanagariSignAnusvara"
latin:parentStyle="moreKeysDevanagariSignAnusvara"
latin:keySpec="◌ं|ं"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_candrabindu.xml b/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
index 24cb44ba85..3eb6ca0c0e 100644
--- a/java/res/xml/keystyle_devanagari_sign_candrabindu.xml
+++ b/java/res/xml/keystyle_devanagari_sign_candrabindu.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+25CC: "◌" DOTTED CIRCLE
U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
<key-style
@@ -36,8 +32,7 @@
latin:moreKeys="◌ॅ|ॅ" />
</case>
<default>
- <key-style
- latin:styleName="moreKeysDevanagariSignCandrabindu" />
+ <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" />
</default>
</switch>
<!-- U+25CC: "◌" DOTTED CIRCLE
@@ -46,5 +41,5 @@
latin:styleName="baseKeyDevanagariSignCandrabindu"
latin:parentStyle="moreKeysDevanagariSignCandrabindu"
latin:keySpec="◌ँ|ँ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_nukta.xml b/java/res/xml/keystyle_devanagari_sign_nukta.xml
index 41da555ce5..e12848c6c6 100644
--- a/java/res/xml/keystyle_devanagari_sign_nukta.xml
+++ b/java/res/xml/keystyle_devanagari_sign_nukta.xml
@@ -22,33 +22,26 @@
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -57,5 +50,5 @@
latin:styleName="baseKeyDevanagariSignNukta"
latin:parentStyle="moreKeysDevanagariSignNukta"
latin:keySpec="◌़|़"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_virama.xml b/java/res/xml/keystyle_devanagari_sign_virama.xml
index 58dd42a2af..a7c5998eff 100644
--- a/java/res/xml/keystyle_devanagari_sign_virama.xml
+++ b/java/res/xml/keystyle_devanagari_sign_virama.xml
@@ -22,30 +22,23 @@
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -54,5 +47,5 @@
latin:styleName="baseKeyDevanagariSignVirama"
latin:parentStyle="moreKeysDevanagariSignVirama"
latin:keySpec="◌्|्"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
- </merge>
+ latin:keyLabelFlags="followKeyLetterRatio" />
+</merge>
diff --git a/java/res/xml/keystyle_devanagari_sign_visarga.xml b/java/res/xml/keystyle_devanagari_sign_visarga.xml
index 45f519a43f..d66e8e2448 100644
--- a/java/res/xml/keystyle_devanagari_sign_visarga.xml
+++ b/java/res/xml/keystyle_devanagari_sign_visarga.xml
@@ -22,13 +22,11 @@
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+25CC: "◌" DOTTED CIRCLE
U+0903: "ः" DEVANAGARI SIGN VISARGA -->
<key-style
latin:styleName="baseKeyDevanagariSignVisarga"
latin:keySpec="◌ः|ः"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml b/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
index 1a60ca22ff..6a62a1f1c5 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_aa.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_aa.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+25CC: "◌" DOTTED CIRCLE
U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
U+093E/U+0901: "ाà¤" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU -->
@@ -36,26 +32,21 @@
latin:styleName="moreKeysDevanagariVowelSignAa"
latin:moreKeys="◌ां|ां,◌ाँ|ाँ,%" />
</case>
- <case
- latin:keyboardLayoutSet="hindi_compact"
- >
+ <case latin:keyboardLayoutSet="hindi_compact">
<!-- U+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -64,5 +55,5 @@
latin:styleName="baseKeyDevanagariVowelSignAa"
latin:parentStyle="moreKeysDevanagariVowelSignAa"
latin:keySpec="◌ा|ा"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
index e6b64e56ca..53f8317259 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ai.xml
@@ -22,47 +22,36 @@
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -71,5 +60,5 @@
latin:styleName="baseKeyDevanagariVowelSignAi"
latin:parentStyle="moreKeysDevanagariVowelSignAi"
latin:keySpec="◌ै|ै"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
index 3e129ec873..04f84562d1 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_au.xml
@@ -22,39 +22,30 @@
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
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 -->
@@ -62,5 +53,5 @@
latin:styleName="baseKeyDevanagariVowelSignAu"
latin:parentStyle="moreKeysDevanagariVowelSignAu"
latin:keySpec="◌ौ|ौ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
index b7d0908e18..2f2998fb80 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -22,30 +22,23 @@
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -54,5 +47,5 @@
latin:styleName="baseKeyDevanagariVowelSignCandraE"
latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
latin:keySpec="◌ॅ|ॅ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
index 861dd1a3dc..c36e3fbac8 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -22,30 +22,23 @@
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -54,5 +47,5 @@
latin:styleName="baseKeyDevanagariVowelSignCandraO"
latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
latin:keySpec="◌ॉ|ॉ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
index 95d85a91d7..481e53eb4d 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_e.xml
@@ -22,39 +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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
U+0903: "ःâ€" DEVANAGARI SIGN VISARGA
U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
@@ -63,8 +53,7 @@
latin:moreKeys="◌ः|ः,ऽ" />
</case>
<default>
- <key-style
- latin:styleName="moreKeysDevanagariVowelSignE" />
+ <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
</default>
</switch>
<!-- U+25CC: "◌" DOTTED CIRCLE
@@ -73,5 +62,5 @@
latin:styleName="baseKeyDevanagariVowelSignE"
latin:parentStyle="moreKeysDevanagariVowelSignE"
latin:keySpec="◌े|े"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
index 5817be1c64..4b3a240b95 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_i.xml
@@ -22,39 +22,30 @@
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -63,5 +54,5 @@
latin:styleName="baseKeyDevanagariVowelSignI"
latin:parentStyle="moreKeysDevanagariVowelSignI"
latin:keySpec="◌ि|ि"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
index a7863c65f5..8ade6efc87 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_ii.xml
@@ -22,39 +22,30 @@
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -63,5 +54,5 @@
latin:styleName="baseKeyDevanagariVowelSignIi"
latin:parentStyle="moreKeysDevanagariVowelSignIi"
latin:keySpec="◌ी|ी"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml b/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
index 3dc874e1a9..3afded4260 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_o.xml
+++ b/java/res/xml/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+25CC: "◌" DOTTED CIRCLE
U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
@@ -37,26 +33,21 @@
latin:styleName="moreKeysDevanagariVowelSignO"
latin:moreKeys="◌ों|ों,◌ॉ|ॉ,◌ॊ|ॊ" />
</case>
- <case
- latin:keyboardLayoutSet="hindi_compact"
- >
+ <case latin:keyboardLayoutSet="hindi_compact">
<!-- U+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -65,5 +56,5 @@
latin:styleName="baseKeyDevanagariVowelSignO"
latin:parentStyle="moreKeysDevanagariVowelSignO"
latin:keySpec="◌ो|ो"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml b/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
index 226c11a06c..1eb19b5734 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_u.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_u.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+25CC: "◌" DOTTED CIRCLE
U+0941/U+0902: "à¥à¤‚" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
U+0941/U+0901: "à¥à¤" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU -->
@@ -36,26 +32,21 @@
latin:styleName="moreKeysDevanagariVowelSignU"
latin:moreKeys="◌ुं|ुं,◌ुँ|ुँ" />
</case>
- <case
- latin:keyboardLayoutSet="hindi_compact"
- >
+ <case latin:keyboardLayoutSet="hindi_compact">
<!-- U+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -64,5 +55,5 @@
latin:styleName="baseKeyDevanagariVowelSignU"
latin:parentStyle="moreKeysDevanagariVowelSignU"
latin:keySpec="◌ु|ु"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml b/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
index 7a9f47d77e..0bb3426e4c 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_uu.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_uu.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+25CC: "◌" DOTTED CIRCLE
U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
U+0942/U+0901: "ूà¤" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU -->
@@ -36,26 +32,21 @@
latin:styleName="moreKeysDevanagariVowelSignUu"
latin:moreKeys="◌ूं|ूं,◌ूँ|ूँ,%" />
</case>
- <case
- latin:keyboardLayoutSet="hindi_compact"
- >
+ <case latin:keyboardLayoutSet="hindi_compact">
<!-- U+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
@@ -64,5 +55,5 @@
latin:styleName="baseKeyDevanagariVowelSignUu"
latin:parentStyle="moreKeysDevanagariVowelSignUu"
latin:keySpec="◌ू|ू"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 56b7396428..688826a43e 100644
--- a/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/java/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -22,22 +22,16 @@
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+25CC: "◌" DOTTED CIRCLE
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+25CC: "◌" DOTTED CIRCLE
U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
@@ -45,9 +39,7 @@
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+25CC: "◌" DOTTED CIRCLE
@@ -56,17 +48,14 @@
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+25CC: "◌" DOTTED CIRCLE
@@ -75,5 +64,5 @@
latin:styleName="baseKeyDevanagariVowelSignVocalicR"
latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
latin:keySpec="◌ृ|ृ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml
index 266bba407d..9f83fef50f 100644
--- a/java/res/xml/rowkeys_arabic1.xml
+++ b/java/res/xml/rowkeys_arabic1.xml
@@ -18,30 +18,25 @@
*/
-->
-<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+0636: "ض" ARABIC LETTER DAD
U+0661: "Ù¡" ARABIC-INDIC DIGIT ONE -->
<Key
latin:keySpec="ض"
latin:keyHintLabel="1"
- latin:additionalMoreKeys="1,١"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="1,١" />
<!-- U+0635: "ص" ARABIC LETTER SAD
U+0662: "Ù¢" ARABIC-INDIC DIGIT TWO -->
<Key
latin:keySpec="ص"
latin:keyHintLabel="2"
- latin:additionalMoreKeys="2,٢"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="2,٢" />
<!-- U+062B: "Ø«" ARABIC LETTER THEH
U+0663: "Ù£" ARABIC-INDIC DIGIT THREE -->
<Key
latin:keySpec="ث"
latin:keyHintLabel="3"
- latin:additionalMoreKeys="3,٣"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="3,٣" />
<!-- U+0642: "Ù‚" ARABIC LETTER QAF
U+0664: "Ù¤" ARABIC-INDIC DIGIT FOUR
U+06A8: "Ú¨" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
@@ -50,8 +45,7 @@
latin:keySpec="ق"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4,٤"
- latin:moreKeys="ڨ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ڨ" />
<!-- U+0641: "Ù" ARABIC LETTER FEH
U+0665: "Ù¥" ARABIC-INDIC DIGIT FIVE
U+06A4: "Ú¤" ARABIC LETTER VEH
@@ -63,22 +57,19 @@
latin:keySpec="ف"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5,٥"
- latin:moreKeys="ڤ,ڢ,ڥ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ڤ,ڢ,ڥ" />
<!-- U+063A: "غ" ARABIC LETTER GHAIN
U+0666: "Ù¦" ARABIC-INDIC DIGIT SIX -->
<Key
latin:keySpec="غ"
latin:keyHintLabel="6"
- latin:additionalMoreKeys="6,٦"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="6,٦" />
<!-- U+0639: "ع" ARABIC LETTER AIN
U+0667: "Ù§" ARABIC-INDIC DIGIT SEVEN -->
<Key
latin:keySpec="ع"
latin:keyHintLabel="7"
- latin:additionalMoreKeys="7,٧"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="7,٧" />
<!-- U+0647: "Ù‡" ARABIC LETTER HEH
U+0668: "Ù¨" ARABIC-INDIC DIGIT EIGHT
U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
@@ -87,26 +78,22 @@
latin:keySpec="ه"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8,٨"
- latin:moreKeys="ﻫ|ه‍"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ﻫ|ه‍" />
<!-- U+062E: "Ø®" ARABIC LETTER KHAH
U+0669: "Ù©" ARABIC-INDIC DIGIT NINE -->
<Key
latin:keySpec="خ"
latin:keyHintLabel="9"
- latin:additionalMoreKeys="9,٩"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="9,٩" />
<!-- U+062D: "Ø" ARABIC LETTER HAH
U+0660: "Ù " ARABIC-INDIC DIGIT ZERO -->
<Key
latin:keySpec="ح"
latin:keyHintLabel="0"
- latin:additionalMoreKeys="0,٠"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="0,٠" />
<!-- U+062C: "ج" ARABIC LETTER JEEM
U+0686: "Ú†" ARABIC LETTER TCHEH -->
<Key
latin:keySpec="ج"
- latin:moreKeys="چ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="چ" />
</merge>
diff --git a/java/res/xml/rowkeys_arabic2.xml b/java/res/xml/rowkeys_arabic2.xml
index 9bc91e8c78..4f401e8bcf 100644
--- a/java/res/xml/rowkeys_arabic2.xml
+++ b/java/res/xml/rowkeys_arabic2.xml
@@ -18,33 +18,26 @@
*/
-->
-<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+0634: "Ø´" ARABIC LETTER SHEEN
U+069C: "ڜ" ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
<!-- TODO: DroidSansArabic lacks the glyph of U+069C ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE -->
<Key
latin:keySpec="ش"
- latin:moreKeys="ڜ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ڜ" />
<!-- U+0633: "س" ARABIC LETTER SEEN -->
- <Key
- latin:keySpec="س"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="س" />
<!-- U+064A: "ÙŠ" ARABIC LETTER YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
U+0649: "Ù‰" ARABIC LETTER ALEF MAKSURA -->
<Key
latin:keySpec="ي"
- latin:moreKeys="ئ,ى"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ئ,ى" />
<!-- U+0628: "ب" ARABIC LETTER BEH
U+067E: "Ù¾" ARABIC LETTER PEH -->
<Key
latin:keySpec="ب"
- latin:moreKeys="پ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="پ" />
<!-- U+0644: "Ù„" ARABIC LETTER LAM
U+FEFB: "ï»»" ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
U+0627: "ا" ARABIC LETTER ALEF
@@ -56,8 +49,7 @@
U+0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE -->
<Key
latin:keySpec="ل"
- latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ﻻ|لا,ﻷ|لأ,ﻹ|لإ,ﻵ|لآ" />
<!-- U+0627: "ا" ARABIC LETTER ALEF
U+0622: "Ø¢" ARABIC LETTER ALEF WITH MADDA ABOVE
U+0621: "Ø¡" ARABIC LETTER HAMZA
@@ -66,29 +58,19 @@
U+0671: "Ù±" ARABIC LETTER ALEF WASLA -->
<Key
latin:keySpec="ا"
- latin:moreKeys="!fixedColumnOrder!5,آ,ء,أ,إ,ٱ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="!fixedColumnOrder!5,آ,ء,أ,إ,ٱ" />
<!-- U+062A: "ت" ARABIC LETTER TEH -->
- <Key
- latin:keySpec="ت"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ت" />
<!-- U+0646: "Ù†" ARABIC LETTER NOON -->
- <Key
- latin:keySpec="ن"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ن" />
<!-- U+0645: "Ù…" ARABIC LETTER MEEM -->
- <Key
- latin:keySpec="م"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="م" />
<!-- U+0643: "Ùƒ" ARABIC LETTER KAF
U+06AF: "Ú¯" ARABIC LETTER GAF
U+06A9: "Ú©" ARABIC LETTER KEHEH -->
<Key
latin:keySpec="ك"
- latin:moreKeys="گ,ک"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="گ,ک" />
<!-- U+0637: "Ø·" ARABIC LETTER TAH -->
- <Key
- latin:keySpec="ط"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ط" />
</merge>
diff --git a/java/res/xml/rowkeys_arabic3.xml b/java/res/xml/rowkeys_arabic3.xml
index 0bfc66a7de..8b178013e5 100644
--- a/java/res/xml/rowkeys_arabic3.xml
+++ b/java/res/xml/rowkeys_arabic3.xml
@@ -18,49 +18,30 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/keys_arabic3_left" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/keys_arabic3_left" />
<!-- U+0621: "Ø¡" ARABIC LETTER HAMZA -->
- <Key
- latin:keySpec="ء"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ء" />
<!-- U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
- <Key
- latin:keySpec="ؤ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ؤ" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
- <Key
- latin:keySpec="ر"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ر" />
<!-- U+0649: "Ù‰" ARABIC LETTER ALEF MAKSURA
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE -->
<Key
latin:keySpec="ى"
- latin:moreKeys="ئ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ئ" />
<!-- U+0629: "Ø©" ARABIC LETTER TEH MARBUTA -->
- <Key
- latin:keySpec="ة"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ة" />
<!-- U+0648: "Ùˆ" ARABIC LETTER WAW -->
- <Key
- latin:keySpec="و"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="و" />
<!-- U+0632: "ز" ARABIC LETTER ZAIN
U+0698: "Ú˜" ARABIC LETTER JEH -->
<Key
latin:keySpec="ز"
- latin:moreKeys="ژ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ژ" />
<!-- U+0638: "ظ" ARABIC LETTER ZAH -->
- <Key
- latin:keySpec="ظ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ظ" />
<!-- U+062F: "د" ARABIC LETTER DAL -->
- <Key
- latin:keySpec="د"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="د" />
</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic1.xml b/java/res/xml/rowkeys_armenian_phonetic1.xml
index 8ca78dab44..8d54b179c9 100644
--- a/java/res/xml/rowkeys_armenian_phonetic1.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic1.xml
@@ -18,67 +18,55 @@
*/
-->
-<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+0567: "Õ§" ARMENIAN SMALL LETTER EH -->
<Key
latin:keySpec="է"
latin:keyHintLabel="1"
- latin:additionalMoreKeys="1"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="1" />
<!-- U+0569: "Õ©" ARMENIAN SMALL LETTER TO -->
<Key
latin:keySpec="թ"
latin:keyHintLabel="2"
- latin:additionalMoreKeys="2"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="2" />
<!-- U+0583: "Öƒ" ARMENIAN SMALL LETTER PIWR -->
<Key
latin:keySpec="փ"
latin:keyHintLabel="3"
- latin:additionalMoreKeys="3"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="3" />
<!-- U+0571: "Õ±" ARMENIAN SMALL LETTER JA -->
<Key
latin:keySpec="ձ"
latin:keyHintLabel="4"
- latin:additionalMoreKeys="4"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="4" />
<!-- U+057B: "Õ»" ARMENIAN SMALL LETTER JHEH -->
<Key
latin:keySpec="ջ"
latin:keyHintLabel="5"
- latin:additionalMoreKeys="5"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="5" />
<!-- U+0580: "Ö€" ARMENIAN SMALL LETTER REH -->
<Key
latin:keySpec="ր"
latin:keyHintLabel="6"
- latin:additionalMoreKeys="6"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="6" />
<!-- U+0579: "Õ¹" ARMENIAN SMALL LETTER CHA -->
<Key
latin:keySpec="չ"
latin:keyHintLabel="7"
- latin:additionalMoreKeys="7"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="7" />
<!-- U+0573: "Õ³" ARMENIAN SMALL LETTER CHEH -->
<Key
latin:keySpec="ճ"
latin:keyHintLabel="8"
- latin:additionalMoreKeys="8"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="8" />
<!-- U+056A: "Õª" ARMENIAN SMALL LETTER ZHE -->
<Key
latin:keySpec="ժ"
latin:keyHintLabel="9"
- latin:additionalMoreKeys="9"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="9" />
<!-- U+056E: "Õ®" ARMENIAN SMALL LETTER CA -->
<Key
latin:keySpec="ծ"
latin:keyHintLabel="0"
- latin:additionalMoreKeys="0"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="0" />
</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic2.xml b/java/res/xml/rowkeys_armenian_phonetic2.xml
index 9991f739d2..cb1b932b9e 100644
--- a/java/res/xml/rowkeys_armenian_phonetic2.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic2.xml
@@ -18,50 +18,29 @@
*/
-->
-<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+0584: "Ö„" ARMENIAN SMALL LETTER KEH -->
- <Key
- latin:keySpec="ք"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ք" />
<!-- U+0578: "Õ¸" ARMENIAN SMALL LETTER VO -->
- <Key
- latin:keySpec="ո"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ո" />
<!-- U+0565: "Õ¥" ARMENIAN SMALL LETTER ECH
U+0587: "Ö‡" ARMENIAN SMALL LIGATURE ECH YIWN -->
<Key
latin:keySpec="ե"
latin:moreKeys="և"
- latin:keyHintLabel="և"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyHintLabel="և" />
<!-- U+057C: "Õ¼" ARMENIAN SMALL LETTER RA -->
- <Key
- latin:keySpec="ռ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ռ" />
<!-- U+057F: "Õ¿" ARMENIAN SMALL LETTER TIWN -->
- <Key
- latin:keySpec="տ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="տ" />
<!-- U+0568: "Õ¨" ARMENIAN SMALL LETTER ET -->
- <Key
- latin:keySpec="ը"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ը" />
<!-- U+0582: "Ö‚" ARMENIAN SMALL LETTER YIWN -->
- <Key
- latin:keySpec="ւ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ւ" />
<!-- U+056B: "Õ«" ARMENIAN SMALL LETTER INI -->
- <Key
- latin:keySpec="ի"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ի" />
<!-- U+0585: "Ö…" ARMENIAN SMALL LETTER OH -->
- <Key
- latin:keySpec="օ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="օ" />
<!-- U+057A: "Õº" ARMENIAN SMALL LETTER PEH -->
- <Key
- latin:keySpec="պ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="պ" />
</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic3.xml b/java/res/xml/rowkeys_armenian_phonetic3.xml
index 2b79386acf..33db4529f3 100644
--- a/java/res/xml/rowkeys_armenian_phonetic3.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic3.xml
@@ -18,43 +18,23 @@
*/
-->
-<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+0561: "Õ¡" ARMENIAN SMALL LETTER AYB -->
- <Key
- latin:keySpec="ա"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ա" />
<!-- U+057D: "Õ½" ARMENIAN SMALL LETTER SEH -->
- <Key
- latin:keySpec="ս"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ս" />
<!-- U+0564: "Õ¤" ARMENIAN SMALL LETTER DA -->
- <Key
- latin:keySpec="դ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="դ" />
<!-- U+0586: "Ö†" ARMENIAN SMALL LETTER FEH -->
- <Key
- latin:keySpec="ֆ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ֆ" />
<!-- U+0563: "Õ£" ARMENIAN SMALL LETTER GIM -->
- <Key
- latin:keySpec="գ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="գ" />
<!-- U+0570: "Õ°" ARMENIAN SMALL LETTER HO -->
- <Key
- latin:keySpec="հ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="հ" />
<!-- U+0575: "Õµ" ARMENIAN SMALL LETTER YI -->
- <Key
- latin:keySpec="յ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="յ" />
<!-- U+056F: "Õ¯" ARMENIAN SMALL LETTER KEN -->
- <Key
- latin:keySpec="կ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="կ" />
<!-- U+056C: "Õ¬" ARMENIAN SMALL LETTER LIWN -->
- <Key
- latin:keySpec="լ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="լ" />
</merge>
diff --git a/java/res/xml/rowkeys_armenian_phonetic4.xml b/java/res/xml/rowkeys_armenian_phonetic4.xml
index f8cdd12216..c7db25b73d 100644
--- a/java/res/xml/rowkeys_armenian_phonetic4.xml
+++ b/java/res/xml/rowkeys_armenian_phonetic4.xml
@@ -18,35 +18,19 @@
*/
-->
-<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+0566: "Õ¦" ARMENIAN SMALL LETTER ZA -->
- <Key
- latin:keySpec="զ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="զ" />
<!-- U+0572: "Õ²" ARMENIAN SMALL LETTER GHAD -->
- <Key
- latin:keySpec="ղ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ղ" />
<!-- U+0581: "Ö" ARMENIAN SMALL LETTER CO -->
- <Key
- latin:keySpec="ց"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ց" />
<!-- U+057E: "Õ¾" ARMENIAN SMALL LETTER VEW -->
- <Key
- latin:keySpec="վ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="վ" />
<!-- U+0562: "Õ¢" ARMENIAN SMALL LETTER BEN -->
- <Key
- latin:keySpec="բ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="բ" />
<!-- U+0576: "Õ¶" ARMENIAN SMALL LETTER NOW -->
- <Key
- latin:keySpec="ն"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ն" />
<!-- U+0574: "Õ´" ARMENIAN SMALL LETTER MEN -->
- <Key
- latin:keySpec="մ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="մ" />
</merge>
diff --git a/java/res/xml/rowkeys_bengali1.xml b/java/res/xml/rowkeys_bengali1.xml
index c137d12e0f..c1fd8b4342 100644
--- a/java/res/xml/rowkeys_bengali1.xml
+++ b/java/res/xml/rowkeys_bengali1.xml
@@ -18,44 +18,37 @@
*/
-->
-<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+0994: "ঔ" BENGALI LETTER AU
U+09E7: "১" BENGALI DIGIT ONE -->
<Key
latin:keySpec="ঔ"
latin:keyHintLabel="১"
- latin:additionalMoreKeys="১,1"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="১,1" />
<!-- U+0990: "à¦" BENGALI LETTER AI
U+09E8: "২" BENGALI DIGIT TWO -->
<Key
latin:keySpec="ঐ"
latin:keyHintLabel="২"
- latin:additionalMoreKeys="২,2"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="২,2" />
<!-- U+0986: "আ" BENGALI LETTER AA
U+09E9: "৩" BENGALI DIGIT THREE -->
<Key
latin:keySpec="আ"
latin:keyHintLabel="৩"
- latin:additionalMoreKeys="৩,3"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="৩,3" />
<!-- U+0988: "ঈ" BENGALI LETTER II
U+09EA: "৪" BENGALI DIGIT FOUR -->
<Key
latin:keySpec="ঈ"
latin:keyHintLabel="৪"
- latin:additionalMoreKeys="৪,4"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="৪,4" />
<!-- U+098A: "ঊ" BENGALI LETTER UU
U+09EB: "৫" BENGALI DIGIT FIVE -->
<Key
latin:keySpec="ঊ"
latin:keyHintLabel="৫"
- latin:additionalMoreKeys="৫,5"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="৫,5" />
<!-- U+09AC: "ব" BENGALI LETTER BA
U+09AD: "à¦" BENGALI LETTER BHA
U+09EC: "৬" BENGALI DIGIT SIX -->
@@ -63,15 +56,13 @@
latin:keySpec="ব"
latin:moreKeys="ভ,%"
latin:keyHintLabel="৬"
- latin:additionalMoreKeys="৬,6"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="৬,6" />
<!-- U+09B9: "হ" BENGALI LETTER HA
U+09ED: "à§" BENGALI DIGIT SEVEN -->
<Key
latin:keySpec="হ"
latin:keyHintLabel="৭"
- latin:additionalMoreKeys="৭,7"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="৭,7" />
<!-- U+0997: "গ" BENGALI LETTER GA
U+0998: "ঘ" BENGALI LETTER GHA
U+09EE: "৮" BENGALI DIGIT EIGHT -->
@@ -79,8 +70,7 @@
latin:keySpec="গ"
latin:moreKeys="ঘ,%"
latin:keyHintLabel="৮"
- latin:additionalMoreKeys="৮,8"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="৮,8" />
<!-- U+09A6: "দ" BENGALI LETTER DA
U+09A7: "ধ" BENGALI LETTER DHA
U+09EF: "৯" BENGALI DIGIT NINE -->
@@ -88,8 +78,7 @@
latin:keySpec="দ"
latin:moreKeys="ধ,%"
latin:keyHintLabel="৯"
- latin:additionalMoreKeys="৯,9"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="৯,9" />
<!-- U+099C: "জ" BENGALI LETTER JA
U+099D: "à¦" BENGALI LETTER JHA
U+099C/U+09CD/U+099E: "জà§à¦ž" BENGALI LETTER JA/BENGALI SIGN VIRAMA/BENGALI LETTER NYA
@@ -98,12 +87,10 @@
latin:keySpec="জ"
latin:moreKeys="ঝ,জ্ঞ,%"
latin:keyHintLabel="০"
- latin:additionalMoreKeys="০,0"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="০,0" />
<!-- U+09A1: "ড" BENGALI LETTER DDA
U+09A1/U+09BC: "ড়" BENGALI LETTER DDA/BENGALI SIGN NUKTA -->
<Key
latin:keySpec="ড"
- latin:moreKeys="ড়"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ড়" />
</merge>
diff --git a/java/res/xml/rowkeys_bengali2.xml b/java/res/xml/rowkeys_bengali2.xml
index 589ce017d3..44b3617971 100644
--- a/java/res/xml/rowkeys_bengali2.xml
+++ b/java/res/xml/rowkeys_bengali2.xml
@@ -18,77 +18,64 @@
*/
-->
-<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+0993: "ও" BENGALI LETTER O
U+09CB: "ো" BENGALI VOWEL SIGN O -->
<Key
latin:keySpec="ও"
- latin:moreKeys="ো"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ো" />
<!-- U+098F: "à¦" BENGALI LETTER E
U+09C7: "ে" BENGALI VOWEL SIGN E -->
<Key
latin:keySpec="এ"
- latin:moreKeys="ে"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ে" />
<!-- U+0985: "অ" BENGALI LETTER A
U+09CD: "à§" BENGALI SIGN VIRAMA -->
<Key
latin:keySpec="অ"
- latin:moreKeys="্"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="্" />
<!-- U+0987: "ই" BENGALI LETTER I
U+09BF: "ি" BENGALI VOWEL SIGN I -->
<Key
latin:keySpec="ই"
- latin:moreKeys="ি"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ি" />
<!-- U+0989: "উ" BENGALI LETTER U
U+09C1: "à§" BENGALI VOWEL SIGN U -->
<Key
latin:keySpec="উ"
- latin:moreKeys="ু"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ু" />
<!-- U+09AA: "প" BENGALI LETTER PA
U+09AB: "ফ" BENGALI LETTER PHA -->
<Key
latin:keySpec="প"
- latin:moreKeys="ফ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ফ" />
<!-- U+09B0: "র" BENGALI LETTER RA
U+09C3: "ৃ" BENGALI VOWEL SIGN VOCALIC R
U+098B: "ঋ" BENGALI LETTER VOCALIC R
U+09A4/U+09CD/U+09B0: "তà§à¦°" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER RA -->
<Key
latin:keySpec="র"
- latin:moreKeys="ৃ,ঋ,ত্র"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ৃ,ঋ,ত্র" />
<!-- U+0995: "ক" BENGALI LETTER KA
U+0996: "খ" BENGALI LETTER KHA -->
<Key
latin:keySpec="ক"
- latin:moreKeys="খ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="খ" />
<!-- U+09A4: "ত" BENGALI LETTER TA
U+09CE: "ৎ" BENGALI LETTER KHANDA TA
U+09A5: "থ" BENGALI LETTER THA
U+09A4/U+09CD/U+09A4: "তà§à¦¤" BENGALI LETTER TA/BENGALI SIGN VIRAMA/BENGALI LETTER TA -->
<Key
latin:keySpec="ত"
- latin:moreKeys="ৎ,থ,ত্ত"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ৎ,থ,ত্ত" />
<!-- U+099A: "চ" BENGALI LETTER CA
U+099B: "ছ" BENGALI LETTER CHA -->
<Key
latin:keySpec="চ"
- latin:moreKeys="ছ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ছ" />
<!-- U+099F: "ট" BENGALI LETTER TTA
U+09A0: "ঠ" BENGALI LETTER TTHA -->
<Key
latin:keySpec="ট"
- latin:moreKeys="ঠ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ঠ" />
</merge>
diff --git a/java/res/xml/rowkeys_bengali3.xml b/java/res/xml/rowkeys_bengali3.xml
index b6d46850f7..5222b096b8 100644
--- a/java/res/xml/rowkeys_bengali3.xml
+++ b/java/res/xml/rowkeys_bengali3.xml
@@ -18,65 +18,51 @@
*/
-->
-<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+0981: "à¦" BENGALI SIGN CANDRABINDU
U+0983: "ঃ" BENGALI SIGN VISARGA
U+0982: "ং" BENGALI SIGN ANUSVARA -->
<Key
latin:keySpec="ঁ"
- latin:moreKeys="ঃ,ং"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ঃ,ং" />
<!-- U+09A2: "ঢ" BENGALI LETTER DDHA
U+09A2/U+09BC: "ঢ়" BENGALI LETTER DDHA/BENGALI SIGN NUKTA -->
<Key
latin:keySpec="ঢ"
- latin:moreKeys="ঢ়"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ঢ়" />
<!-- U+09AE: "ম" BENGALI LETTER MA -->
- <Key
- latin:keySpec="ম"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ম" />
<!-- U+09A8: "ন" BENGALI LETTER NA
U+09A3: "ণ" BENGALI LETTER NNA -->
<Key
latin:keySpec="ন"
- latin:moreKeys="ণ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ণ" />
<!-- U+099E: "ঞ" BENGALI LETTER NYA
U+0999: "ঙ" BENGALI LETTER NGA
U+099E/U+09CD/U+099C: "ঞà§à¦œ" BENGALI LETTER NYA/BENGALI SIGN VIRAMA/BENGALI LETTER JA -->
<Key
latin:keySpec="ঞ"
- latin:moreKeys="ঙ,ঞ্জ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ঙ,ঞ্জ" />
<!-- U+09B2: "ল" BENGALI LETTER LA -->
- <Key
- latin:keySpec="ল"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ল" />
<!-- U+09B7: "ষ" BENGALI LETTER SSA
U+0995/U+09CD/U+09B7: "কà§à¦·" BENGALI LETTER KA/BENGALI SIGN VIRAMA/BENGALI LETTER SSA -->
<Key
latin:keySpec="ষ"
- latin:moreKeys="ক্ষ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ক্ষ" />
<!-- U+09B8: "স" BENGALI LETTER SA
U+09B6: "শ" BENGALI LETTER SHA -->
<Key
latin:keySpec="স"
- latin:moreKeys="শ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="শ" />
<!-- U+09DF: "য়" BENGALI LETTER YYA
U+09AF: "য" BENGALI LETTER YA -->
<Key
latin:keySpec="য়"
- latin:moreKeys="য"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="য" />
<!-- U+0964: "।" DEVANAGARI DANDA
U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
<Key
latin:keySpec="।"
- latin:moreKeys="॥"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="॥" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml
index 46fef42367..abc2c96141 100644
--- a/java/res/xml/rowkeys_farsi1.xml
+++ b/java/res/xml/rowkeys_farsi1.xml
@@ -18,58 +18,49 @@
*/
-->
-<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+0636: "ض" ARABIC LETTER DAD
U+06F1: "Û±" EXTENDED ARABIC-INDIC DIGIT ONE -->
<Key
latin:keySpec="ض"
latin:keyHintLabel="۱"
- latin:additionalMoreKeys="۱,1"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="۱,1" />
<!-- U+0635: "ص" ARABIC LETTER SAD
U+06F2: "Û²" EXTENDED ARABIC-INDIC DIGIT TWO -->
<Key
latin:keySpec="ص"
latin:keyHintLabel="۲"
- latin:additionalMoreKeys="۲,2"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="۲,2" />
<!-- U+062B: "Ø«" ARABIC LETTER THEH
U+06F3: "Û³" EXTENDED ARABIC-INDIC DIGIT THREE -->
<Key
latin:keySpec="ث"
latin:keyHintLabel="۳"
- latin:additionalMoreKeys="۳,3"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="۳,3" />
<!-- U+0642: "Ù‚" ARABIC LETTER QAF
U+06F4: "Û´" EXTENDED ARABIC-INDIC DIGIT FOUR -->
<Key
latin:keySpec="ق"
latin:keyHintLabel="۴"
- latin:additionalMoreKeys="۴,4"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="۴,4" />
<!-- U+0641: "Ù" ARABIC LETTER FEH
U+06F5: "Ûµ" EXTENDED ARABIC-INDIC DIGIT FIVE -->
<Key
latin:keySpec="ف"
latin:keyHintLabel="۵"
- latin:additionalMoreKeys="۵,5"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="۵,5" />
<!-- U+063A: "غ" ARABIC LETTER GHAIN
U+06F6: "Û¶" EXTENDED ARABIC-INDIC DIGIT SIX -->
<Key
latin:keySpec="غ"
latin:keyHintLabel="۶"
- latin:additionalMoreKeys="۶,6"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="۶,6" />
<!-- U+0639: "ع" ARABIC LETTER AIN
U+06F7: "Û·" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
<Key
latin:keySpec="ع"
latin:keyHintLabel="۷"
- latin:additionalMoreKeys="۷,7"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="۷,7" />
<!-- U+0647: "Ù‡" ARABIC LETTER HEH
U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
@@ -80,24 +71,19 @@
latin:keySpec="ه"
latin:moreKeys="ﻫ|ه‍,هٔ,ة,%"
latin:keyHintLabel="۸"
- latin:additionalMoreKeys="۸,8"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="۸,8" />
<!-- U+062E: "Ø®" ARABIC LETTER KHAH
U+06F9: "Û¹" EXTENDED ARABIC-INDIC DIGIT NINE -->
<Key
latin:keySpec="خ"
latin:keyHintLabel="۹"
- latin:additionalMoreKeys="۹,9"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="۹,9" />
<!-- U+062D: "Ø" ARABIC LETTER HAH
U+06F0: "Û°" EXTENDED ARABIC-INDIC DIGIT ZERO -->
<Key
latin:keySpec="ح"
latin:keyHintLabel="۰"
- latin:additionalMoreKeys="۰,0"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="۰,0" />
<!-- U+062C: "ج" ARABIC LETTER JEEM -->
- <Key
- latin:keySpec="ج"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ج" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml
index f94ee8e497..82f1903c7e 100644
--- a/java/res/xml/rowkeys_farsi2.xml
+++ b/java/res/xml/rowkeys_farsi2.xml
@@ -18,17 +18,11 @@
*/
-->
-<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+0634: "Ø´" ARABIC LETTER SHEEN -->
- <Key
- latin:keySpec="ش"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ش" />
<!-- U+0633: "س" ARABIC LETTER SEEN -->
- <Key
- latin:keySpec="س"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="س" />
<!-- U+06CC: "ی" ARABIC LETTER FARSI YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
U+064A: "ÙŠ" ARABIC LETTER YEH
@@ -36,16 +30,11 @@
U+0649: "Ù‰" ARABIC LETTER ALEF MAKSURA -->
<Key
latin:keySpec="ی"
- latin:moreKeys="ئ,ي,ﯨ|ى"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ئ,ي,ﯨ|ى" />
<!-- U+0628: "ب" ARABIC LETTER BEH -->
- <Key
- latin:keySpec="ب"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ب" />
<!-- U+0644: "Ù„" ARABIC LETTER LAM -->
- <Key
- latin:keySpec="ل"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ل" />
<!-- U+0627: "ا" ARABIC LETTER ALEF
U+0671: "Ù±" ARABIC LETTER ALEF WASLA
U+0621: "Ø¡" ARABIC LETTER HAMZA
@@ -54,30 +43,21 @@
U+0625: "Ø¥" ARABIC LETTER ALEF WITH HAMZA BELOW -->
<Key
latin:keySpec="ا"
- latin:moreKeys="!fixedColumnOrder!5,ٱ,ء,آ,أ,إ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="!fixedColumnOrder!5,ٱ,ء,آ,أ,إ" />
<!-- U+062A: "ت" ARABIC LETTER TEH
U+0629: "Ø©": ARABIC LETTER TEH MARBUTA -->
<Key
latin:keySpec="ت"
- latin:moreKeys="ة"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ة" />
<!-- U+0646: "Ù†" ARABIC LETTER NOON -->
- <Key
- latin:keySpec="ن"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ن" />
<!-- U+0645: "Ù…" ARABIC LETTER MEEM -->
- <Key
- latin:keySpec="م"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="م" />
<!-- U+06A9: "Ú©" ARABIC LETTER KEHEH
U+0643: "Ùƒ" ARABIC LETTER KAF -->
<Key
latin:keySpec="ک"
- latin:moreKeys="ك"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ك" />
<!-- U+06AF: "Ú¯" ARABIC LETTER GAF -->
- <Key
- latin:keySpec="گ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="گ" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml
index edc22f95a7..b825a36d51 100644
--- a/java/res/xml/rowkeys_farsi3.xml
+++ b/java/res/xml/rowkeys_farsi3.xml
@@ -18,47 +18,27 @@
*/
-->
-<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+0638: "ظ" ARABIC LETTER ZAH -->
- <Key
- latin:keySpec="ظ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ظ" />
<!-- U+0637: "Ø·" ARABIC LETTER TAH -->
- <Key
- latin:keySpec="ط"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ط" />
<!-- U+0698: "Ú˜" ARABIC LETTER JEH -->
- <Key
- latin:keySpec="ژ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ژ" />
<!-- U+0632: "ز" ARABIC LETTER ZAIN -->
- <Key
- latin:keySpec="ز"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ز" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
- <Key
- latin:keySpec="ر"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ر" />
<!-- U+0630: "Ø°" ARABIC LETTER THAL -->
- <Key
- latin:keySpec="ذ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ذ" />
<!-- U+062F: "د" ARABIC LETTER DAL -->
- <Key
- latin:keySpec="د"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="د" />
<!-- U+067E: "Ù¾" ARABIC LETTER PEH -->
- <Key
- latin:keySpec="پ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="پ" />
<!-- U+0648: "Ùˆ" ARABIC LETTER WAW
U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
<Key
latin:keySpec="و"
- latin:moreKeys="ؤ"
- latin:keyLabelFlags="fontNormal" />
- <include
- latin:keyboardLayout="@xml/keys_farsi3_right" />
+ latin:moreKeys="ؤ" />
+ <include latin:keyboardLayout="@xml/keys_farsi3_right" />
</merge>
diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml
index cff9756cfa..cd08e16002 100644
--- a/java/res/xml/rowkeys_hindi1.xml
+++ b/java/res/xml/rowkeys_hindi1.xml
@@ -18,82 +18,61 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0914: "औ" DEVANAGARI LETTER AU
U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keySpec="औ"
- latin:moreKeys="ऒं"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ऒं" />
<!-- U+0910: "à¤" DEVANAGARI LETTER AI
U+0910/U+0902: "à¤à¤‚" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keySpec="ऐ"
- latin:moreKeys="ऐं"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ऐं" />
<!-- U+0906: "आ" DEVANAGARI LETTER AA
U+0906/U+0902: "आं" DEVANAGARI LETTER AA/DEVANAGARI SIGN ANUSVARA
U+0906/U+0901: "आà¤" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU -->
<Key
latin:keySpec="आ"
- latin:moreKeys="आं,आँ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="आं,आँ" />
<!-- U+0908: "ई" DEVANAGARI LETTER II
U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keySpec="ई"
- latin:moreKeys="ईं"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ईं" />
<!-- U+090A: "ऊ" DEVANAGARI LETTER UU
U+090A/U+0902: "ऊं" DEVANAGARI LETTER UU/DEVANAGARI SIGN ANUSVARA
U+090A/U+0901: "ऊà¤" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU -->
<Key
latin:keySpec="ऊ"
- latin:moreKeys="ऊं,ऊँ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ऊं,ऊँ" />
<!-- U+092D: "à¤" DEVANAGARI LETTER BHA -->
- <Key
- latin:keySpec="भ"
- latin:keyLabelFlags="fontNormal" />
+ <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_visarga" />
- <Key
- latin:keyStyle="baseKeyDevanagariSignVisarga" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
+ <Key latin:keyStyle="baseKeyDevanagariSignVisarga" />
<!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
- <Key
- latin:keySpec="घ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="घ" />
<!-- U+0927: "ध" DEVANAGARI LETTER DHA
U+0915/U+094D/U+0937: "कà¥à¤·" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
U+0936/U+094D/U+0930: "शà¥à¤°" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
<Key
latin:keySpec="ध"
- latin:moreKeys="क्ष,श्र"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="क्ष,श्र" />
<!-- U+091D: "à¤" DEVANAGARI LETTER JHA -->
- <Key
- latin:keySpec="झ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="झ" />
<!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
- <Key
- latin:keySpec="ढ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ढ" />
</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_au" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
<!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAu"
@@ -102,8 +81,7 @@
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
<!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAi"
@@ -112,8 +90,7 @@
<!-- 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_aa" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
<!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAa"
@@ -122,8 +99,7 @@
<!-- 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_ii" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
<!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignIi"
@@ -132,8 +108,7 @@
<!-- 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_uu" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
<!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignUu"
@@ -146,15 +121,13 @@
latin:keySpec="ब"
latin:moreKeys="ब॒,%"
latin:keyHintLabel="6"
- latin:additionalMoreKeys="६,6"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="६,6" />
<!-- U+0939: "ह" DEVANAGARI LETTER HA
U+096D: "à¥" DEVANAGARI DIGIT SEVEN -->
<Key
latin:keySpec="ह"
latin:keyHintLabel="7"
- latin:additionalMoreKeys="७,7"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="७,7" />
<!-- U+0917: "ग" DEVANAGARI LETTER GA
U+091C/U+094D/U+091E: "जà¥à¤ž" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
U+0917/U+093C: "ग़" DEVANAGARI LETTER GA/DEVANAGARI SIGN NUKTA
@@ -164,15 +137,13 @@
latin:keySpec="ग"
latin:moreKeys="ज्ञ,ग़,ग॒,%"
latin:keyHintLabel="8"
- latin:additionalMoreKeys="८,8"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="८,8" />
<!-- U+0926: "द" DEVANAGARI LETTER DA
U+096F: "९" DEVANAGARI DIGIT NINE -->
<Key
latin:keySpec="द"
latin:keyHintLabel="9"
- latin:additionalMoreKeys="९,9"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="९,9" />
<!-- U+091C: "ज" DEVANAGARI LETTER JA
U+091C/U+0952: "ज॒" DEVANAGARI LETTER JA/DEVANAGARI STRESS SIGN ANUDATTA
U+091C/U+094D/U+091E: "जà¥à¤ž" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
@@ -182,15 +153,13 @@
latin:keySpec="ज"
latin:moreKeys="ज॒,ज्ञ,ज़,%"
latin:keyHintLabel="0"
- latin:additionalMoreKeys="०,0"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="०,0" />
<!-- U+0921: "ड" DEVANAGARI LETTER DDA
U+0921/U+0952: "ड॒" DEVANAGARI LETTER DDA/DEVANAGARI STRESS SIGN ANUDATTA
U+0921/U+093C: "ड़" DEVANAGARI LETTER DDA/DEVANAGARI SIGN NUKTA -->
<Key
latin:keySpec="ड"
- latin:moreKeys="ड॒,ड़"
- latin:keyLabelFlags="fontNormal" />
- </default>
+ latin:moreKeys="ड॒,ड़" />
+ </default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml
index 7ba4ee1ece..fec93f3c68 100644
--- a/java/res/xml/rowkeys_hindi2.xml
+++ b/java/res/xml/rowkeys_hindi2.xml
@@ -18,21 +18,16 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0913: "ओ" DEVANAGARI LETTER O
U+0913/U+0902: "ओं" DEVANAGARI LETTER O/DEVANAGARI SIGN ANUSVARA
U+0911: "ऑ" DEVANAGARI LETTER CANDRA O
U+0912: "ऒ" DEVANAGARI LETTER SHORT O -->
<Key
latin:keySpec="ओ"
- latin:moreKeys="ओं,ऑ,ऒ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ओं,ऑ,ऒ" />
<!-- U+090F: "à¤" DEVANAGARI LETTER E
U+090F/U+0902: "à¤à¤‚" DEVANAGARI LETTER E/DEVANAGARI SIGN ANUSVARA
U+090F/U+0901: "à¤à¤" DEVANAGARI LETTER E/DEVANAGARI SIGN CANDRABINDU
@@ -40,129 +35,97 @@
U+090E: "ऎ" DEVANAGARI LETTER SHORT E -->
<Key
latin:keySpec="ए"
- latin:moreKeys="एं,एँ,ऍ,ऎ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="एं,एँ,ऍ,ऎ" />
<!-- U+0905: "अ" DEVANAGARI LETTER A
U+0905/U+0902: "अं" DEVANAGARI LETTER A/DEVANAGARI SIGN ANUSVARA
U+0905/U+0901: "अà¤" DEVANAGARI LETTER A/DEVANAGARI SIGN CANDRABINDU -->
<Key
latin:keySpec="अ"
- latin:moreKeys="अं,अँ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="अं,अँ" />
<!-- U+0907: "इ" DEVANAGARI LETTER I
U+0907/U+0902: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN ANUSVARA
U+0907/U+0901: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN CANDRABINDU -->
<Key
latin:keySpec="इ"
- latin:moreKeys="इं,इँ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="इं,इँ" />
<!-- U+0909: "उ" DEVANAGARI LETTER U
U+0909/U+0902: "उं" DEVANAGARI LETTER U/DEVANAGARI SIGN ANUSVARA
U+0909/U+0901: "उà¤" DEVANAGARI LETTER U/DEVANAGARI SIGN CANDRABINDU -->
<Key
latin:keySpec="उ"
- latin:moreKeys="उं,उँ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="उं,उँ" />
<!-- U+092B: "फ" DEVANAGARI LETTER PHA
U+092B/U+093C: "फ़" DEVANAGARI LETTER PHA/DEVANAGARI SIGN NUKTA -->
<Key
latin:keySpec="फ"
- latin:moreKeys="फ़"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="फ़" />
<!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
U+094D/U+0930: "à¥à¤°" DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA
U+0930/U+094D: "रà¥" DEVANAGARI LETTER RA/DEVANAGARI SIGN VIRAMA -->
<Key
latin:keySpec="ऱ"
- latin:moreKeys="्र,र्"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="्र,र्" />
<!-- U+0916: "ख" DEVANAGARI LETTER KHA
U+0916/U+093C: "ख़" DEVANAGARI LETTER KHA/DEVANAGARI SIGN NUKTA -->
<Key
latin:keySpec="ख"
- latin:moreKeys="ख़"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ख़" />
<!-- U+0925: "थ" DEVANAGARI LETTER THA -->
- <Key
- latin:keySpec="थ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="थ" />
<!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
- <Key
- latin:keySpec="छ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="छ" />
<!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
- <Key
- latin:keySpec="ठ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ठ" />
</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_o" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignO" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+ <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
<!-- 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_i" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignI" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
<!-- 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_u" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignU" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
<!-- U+092A: "प" DEVANAGARI LETTER PA -->
- <Key
- latin:keySpec="प"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="प" />
<!-- U+0930: "र" DEVANAGARI LETTER RA
U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
U+0930/U+093C: "ऱ" DEVANAGARI LETTER RA/DEVANAGARI SIGN NUKTA
U+0960: "ॠ" DEVANAGARI LETTER VOCALIC RR -->
<Key
latin:keySpec="र"
- latin:moreKeys="ऋ,ऱ,ॠ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ऋ,ऱ,ॠ" />
<!-- U+0915: "क" DEVANAGARI LETTER KA
U+0915/U+093C: "क़" DEVANAGARI LETTER KA/DEVANAGARI SIGN NUKTA -->
<Key
latin:keySpec="क"
- latin:moreKeys="क़"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="क़" />
<!-- U+0924: "त" DEVANAGARI LETTER TA
U+0924/U+094D/U+0930: "तà¥à¤°" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
<Key
latin:keySpec="त"
- latin:moreKeys="त्र"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="त्र" />
<!-- U+091A: "च" DEVANAGARI LETTER CA -->
- <Key
- latin:keySpec="च"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="च" />
<!-- U+091F: "ट" DEVANAGARI LETTER TTA -->
- <Key
- latin:keySpec="ट"
- latin:keyLabelFlags="fontNormal" />
- </default>
+ <Key latin:keySpec="ट" />
+ </default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml
index cf36fc5d42..2e6d6864ee 100644
--- a/java/res/xml/rowkeys_hindi3.xml
+++ b/java/res/xml/rowkeys_hindi3.xml
@@ -18,114 +18,80 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
- <Key
- latin:keySpec="ऑ"
- latin:keyLabelFlags="fontNormal" />
+ <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_candrabindu" />
- <Key
- latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+ <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
<!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
- <Key
- latin:keySpec="ण"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ण" />
<!-- U+0929: "ऩ" DEVANAGARI LETTER NNNA -->
- <Key
- latin:keySpec="ऩ" />
+ <Key latin:keySpec="ऩ" />
<!-- U+0933: "ळ" DEVANAGARI LETTER LLA
U+0934: "ऴ" DEVANAGARI LETTER LLLA -->
<Key
latin:keySpec="ळ"
- latin:moreKeys="ऴ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ऴ" />
<!-- U+0936: "श" DEVANAGARI LETTER SHA -->
- <Key
- latin:keySpec="श"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="श" />
<!-- U+0937: "ष" DEVANAGARI LETTER SSA -->
- <Key
- latin:keySpec="ष"
- latin:keyLabelFlags="fontNormal" />
+ <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_vocalic_r" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
<!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
- <Key
- latin:keySpec="ञ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ञ" />
</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_candra_o" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
<!-- U+092E: "म" DEVANAGARI LETTER MA
U+0950: "à¥" DEVANAGARI OM -->
<Key
latin:keySpec="म"
- latin:moreKeys="ॐ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ॐ" />
<!-- U+0928: "न" DEVANAGARI LETTER NA
U+091E: "ञ" DEVANAGARI LETTER NYA
U+0919: "ङ" DEVANAGARI LETTER NGA
U+0928/U+093C: "ऩ" DEVANAGARI LETTER NA/DEVANAGARI SIGN NUKTA -->
<Key
latin:keySpec="न"
- latin:moreKeys="ञ,ङ,ऩ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ञ,ङ,ऩ" />
<!-- U+0935: "व" DEVANAGARI LETTER VA -->
- <Key
- latin:keySpec="व"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="व" />
<!-- U+0932: "ल" DEVANAGARI LETTER LA
U+090C: "ऌ" DEVANAGARI LETTER VOCALIC L
U+0961: "ॡ" DEVANAGARI LETTER VOCALIC LL -->
<Key
latin:keySpec="ल"
- latin:moreKeys="ऌ,ॡ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ऌ,ॡ" />
<!-- U+0938: "स" DEVANAGARI LETTER SA -->
- <Key
- latin:keySpec="स"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="स" />
<!-- U+092F: "य" DEVANAGARI LETTER YA
U+095F: "य़" DEVANAGARI LETTER YYA -->
<Key
latin:keySpec="य"
- latin:moreKeys="य़"
- latin:keyLabelFlags="fontNormal" />
+ 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_nukta" />
- <Key
- latin:keyStyle="baseKeyDevanagariSignNukta" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
+ <Key latin:keyStyle="baseKeyDevanagariSignNukta" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_hindi_compact1.xml b/java/res/xml/rowkeys_hindi_compact1.xml
index c63de4f0b9..06a014162f 100644
--- a/java/res/xml/rowkeys_hindi_compact1.xml
+++ b/java/res/xml/rowkeys_hindi_compact1.xml
@@ -18,74 +18,62 @@
*/
-->
-<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">
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
<!-- U+0914: "औ" DEVANAGARI LETTER AU
U+0967: "१" DEVANAGARI DIGIT ONE -->
<Key
latin:keySpec="औ"
latin:keyStyle="moreKeysDevanagariVowelSignAu"
latin:keyHintLabel="1"
- latin:additionalMoreKeys="१,1"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="१,1" />
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
<!-- U+0910: "à¤" DEVANAGARI LETTER AI
U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
latin:keySpec="ऐ"
latin:keyStyle="moreKeysDevanagariVowelSignAi"
latin:keyHintLabel="2"
- latin:additionalMoreKeys="२,2"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="२,2" />
<!-- 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_aa" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
<!-- U+0906: "आ" DEVANAGARI LETTER AA
U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
latin:keySpec="आ"
latin:keyStyle="moreKeysDevanagariVowelSignAa"
latin:keyHintLabel="3"
- latin:additionalMoreKeys="३,3"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="३,3" />
<!-- 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_ii" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
<!-- U+0908: "ई" DEVANAGARI LETTER II
U+096A: "४" DEVANAGARI DIGIT FOUR -->
<Key
latin:keySpec="ई"
latin:keyStyle="moreKeysDevanagariVowelSignIi"
latin:keyHintLabel="4"
- latin:additionalMoreKeys="४,4"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="४,4" />
<!-- 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_uu" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
<!-- U+090A: "ऊ" DEVANAGARI LETTER UU
U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
latin:keySpec="ऊ"
latin:keyStyle="moreKeysDevanagariVowelSignUu"
latin:keyHintLabel="5"
- latin:additionalMoreKeys="५,5"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="५,5" />
<!-- U+092C: "ब" DEVANAGARI LETTER BA
U+092D: "à¤" DEVANAGARI LETTER BHA
U+096C: "६" DEVANAGARI DIGIT SIX -->
@@ -93,15 +81,13 @@
latin:keySpec="ब"
latin:moreKeys="भ,%"
latin:keyHintLabel="6"
- latin:additionalMoreKeys="६,6"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="६,6" />
<!-- U+0939: "ह" DEVANAGARI LETTER HA
U+096D: "à¥" DEVANAGARI DIGIT SEVEN -->
<Key
latin:keySpec="ह"
latin:keyHintLabel="7"
- latin:additionalMoreKeys="७,7"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="७,7" />
<!-- U+0917: "ग" DEVANAGARI LETTER GA
U+0918: "घ" DEVANAGARI LETTER GHA
U+096E: "८" DEVANAGARI DIGIT EIGHT -->
@@ -109,8 +95,7 @@
latin:keySpec="ग"
latin:moreKeys="घ,%"
latin:keyHintLabel="8"
- latin:additionalMoreKeys="८,8"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="८,8" />
<!-- U+0926: "द" DEVANAGARI LETTER DA
U+0927: "ध" DEVANAGARI LETTER DHA
U+096F: "९" DEVANAGARI DIGIT NINE -->
@@ -118,8 +103,7 @@
latin:keySpec="द"
latin:moreKeys="ध,%"
latin:keyHintLabel="9"
- latin:additionalMoreKeys="९,9"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="९,9" />
<!-- U+091C: "ज" DEVANAGARI LETTER JA
U+091D: "à¤" DEVANAGARI LETTER JHA
U+091C/U+094D/U+091E: "जà¥à¤ž" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
@@ -128,12 +112,10 @@
latin:keySpec="ज"
latin:moreKeys="झ,ज्ञ,%"
latin:keyHintLabel="0"
- latin:additionalMoreKeys="०,0"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="०,0" />
<!-- U+0921: "ड" DEVANAGARI LETTER DDA
U+0922: "ढ" DEVANAGARI LETTER DDHA -->
<Key
latin:keySpec="ड"
- latin:moreKeys="ढ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ढ" />
</merge>
diff --git a/java/res/xml/rowkeys_hindi_compact2.xml b/java/res/xml/rowkeys_hindi_compact2.xml
index 06364c209d..7cbe5efbbe 100644
--- a/java/res/xml/rowkeys_hindi_compact2.xml
+++ b/java/res/xml/rowkeys_hindi_compact2.xml
@@ -18,98 +18,79 @@
*/
-->
-<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">
<!-- 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_o" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
<!-- U+0913: "ओ" DEVANAGARI LETTER O -->
<Key
latin:keySpec="ओ"
- latin:keyStyle="moreKeysDevanagariVowelSignO"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyStyle="moreKeysDevanagariVowelSignO" />
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
<!-- U+090F: "à¤" DEVANAGARI LETTER E -->
<Key
latin:keySpec="ए"
- latin:keyStyle="moreKeysDevanagariVowelSignE"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyStyle="moreKeysDevanagariVowelSignE" />
<!-- 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" />
<!-- U+0905: "अ" DEVANAGARI LETTER A -->
<Key
latin:keySpec="अ"
- latin:keyStyle="moreKeysDevanagariSignVirama"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyStyle="moreKeysDevanagariSignVirama" />
<!-- 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_i" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
<!-- U+0907: "इ" DEVANAGARI LETTER I -->
<Key
latin:keySpec="इ"
- latin:keyStyle="moreKeysDevanagariVowelSignI"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyStyle="moreKeysDevanagariVowelSignI" />
<!-- 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_u" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
<!-- U+0909: "उ" DEVANAGARI LETTER U -->
<Key
latin:keySpec="उ"
- latin:keyStyle="moreKeysDevanagariVowelSignU"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyStyle="moreKeysDevanagariVowelSignU" />
<!-- U+092A: "प" DEVANAGARI LETTER PA
U+092B: "फ" DEVANAGARI LETTER PHA -->
<Key
latin:keySpec="प"
- latin:moreKeys="फ"
- latin:keyLabelFlags="fontNormal" />
+ 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_vowel_sign_vocalic_r" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
<!-- U+0930: "र" DEVANAGARI LETTER RA -->
<Key
latin:keySpec="र"
- latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" />
<!-- U+0915: "क" DEVANAGARI LETTER KA
U+0916: "ख" DEVANAGARI LETTER KHA -->
<Key
latin:keySpec="क"
- latin:moreKeys="ख"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ख" />
<!-- U+0924: "त" DEVANAGARI LETTER TA
U+0925: "थ" DEVANAGARI LETTER THA
U+0924/U+094D/U+0930: "तà¥à¤°" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
<Key
latin:keySpec="त"
- latin:moreKeys="थ,त्र"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="थ,त्र" />
<!-- U+091A: "च" DEVANAGARI LETTER CA
U+091B: "छ" DEVANAGARI LETTER CHA -->
<Key
latin:keySpec="च"
- latin:moreKeys="छ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="छ" />
<!-- U+091F: "ट" DEVANAGARI LETTER TTA
U+0920: "ठ" DEVANAGARI LETTER TTHA -->
<Key
latin:keySpec="ट"
- latin:moreKeys="ठ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ठ" />
</merge>
diff --git a/java/res/xml/rowkeys_hindi_compact3.xml b/java/res/xml/rowkeys_hindi_compact3.xml
index 0e8165ecc6..89a9f9d60d 100644
--- a/java/res/xml/rowkeys_hindi_compact3.xml
+++ b/java/res/xml/rowkeys_hindi_compact3.xml
@@ -18,72 +18,55 @@
*/
-->
-<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">
<!-- 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_candra_o" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
<!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
<Key
latin:keySpec="ऑ"
- latin:keyStyle="moreKeysDevanagariVowelSignCandraO"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyStyle="moreKeysDevanagariVowelSignCandraO" />
<!-- 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_candra_e" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
<!-- U+090D: "à¤" DEVANAGARI LETTER CANDRA E -->
<Key
latin:keySpec="ऍ"
- latin:keyStyle="moreKeysDevanagariVowelSignCandraE"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyStyle="moreKeysDevanagariVowelSignCandraE" />
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
<!-- U+092E: "म" DEVANAGARI LETTER MA
U+0950: "à¥" DEVANAGARI OM -->
<Key
latin:keySpec="म"
- latin:moreKeys="ॐ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ॐ" />
<!-- U+0928: "न" DEVANAGARI LETTER NA
U+0923: "ण" DEVANAGARI LETTER NNA
U+091E: "ञ" DEVANAGARI LETTER NYA
U+0919: "ङ" DEVANAGARI LETTER NGA -->
<Key
latin:keySpec="न"
- latin:moreKeys="ण,ञ,ङ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ण,ञ,ङ" />
<!-- U+0935: "व" DEVANAGARI LETTER VA -->
- <Key
- latin:keySpec="व"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="व" />
<!-- U+0932: "ल" DEVANAGARI LETTER LA -->
- <Key
- latin:keySpec="ल"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ल" />
<!-- U+0938: "स" DEVANAGARI LETTER SA
U+0936: "श" DEVANAGARI LETTER SHA
U+0937: "ष" DEVANAGARI LETTER SSA
U+0936/U+094D/U+0930: "शà¥à¤°" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
<Key
latin:keySpec="स"
- latin:moreKeys="श,ष,श्र"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="श,ष,श्र" />
<!-- U+092F: "य" DEVANAGARI LETTER YA -->
- <Key
- latin:keySpec="य"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="य" />
<!-- U+0915/U+094D/U+0937: "कà¥à¤·" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA -->
<Key
latin:keySpec="क्ष"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/rowkeys_khmer1.xml b/java/res/xml/rowkeys_khmer1.xml
index 567c6aff0b..79fd231a07 100644
--- a/java/res/xml/rowkeys_khmer1.xml
+++ b/java/res/xml/rowkeys_khmer1.xml
@@ -18,82 +18,75 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+200D: ZERO WIDTH JOINER -->
<Key
latin:keySpec="!"
- latin:moreKeys="!icon/zwj_key|‍" />
+ latin:moreKeys="!icon/zwj_key|‍"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+17D7: "ៗ" KHMER SIGN LEK TOO
U+200C: ZERO WIDTH NON-JOINER -->
<Key
latin:keySpec="ៗ"
- latin:moreKeys="!icon/zwnj_key|‌"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="!icon/zwnj_key|‌" />
<!-- U+17D1: "៑" KHMER SIGN VIRIAM -->
<Key
latin:keySpec="""
latin:keyHintLabel="៑"
- latin:moreKeys="៑" />
+ latin:moreKeys="៑"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+17DB: "៛" KHMER CURRENCY SYMBOL RIEL
U+20AC: "€" EURO SIGN -->
<Key
latin:keySpec="៛"
latin:keyHintLabel="$"
- latin:moreKeys="$,€"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="$,€" />
<!-- U+17D6: "៖" KHMER SIGN CAMNUC PII KUUH -->
<Key
latin:keySpec="%"
latin:keyHintLabel="៖"
- latin:moreKeys="៖" />
+ latin:moreKeys="៖"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+17CD: "áŸ" KHMER SIGN TOANDAKHIAT
U+17D9: "៙" KHMER SIGN PHNAEK MUAN -->
<Key
latin:keySpec="៍"
latin:keyHintLabel="៙"
- latin:moreKeys="៙"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៙" />
<!-- U+17D0: "áŸ" KHMER SIGN SAMYOK SANNYA
U+17DA: "៚" KHMER SIGN KOOMUUT -->
<Key
latin:keySpec="័"
latin:keyHintLabel="៚"
latin:keyHintLabelVerticalAdjustment="-30%"
- latin:moreKeys="៚"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៚" />
<!-- U+17CF: "áŸ" KHMER SIGN AHSDA -->
<Key
latin:keySpec="៏"
latin:keyHintLabel="*"
- latin:moreKeys="*"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="*" />
<!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
latin:keySpec="("
latin:keyHintLabel="{"
- latin:moreKeys="{,«" />
+ latin:moreKeys="{,«"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
latin:keySpec=")"
latin:keyHintLabel="}"
- latin:moreKeys="},»" />
+ latin:moreKeys="},»"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+17CC: "៌" KHMER SIGN ROBAT
U+00D7: "×" MULTIPLICATION SIGN -->
<Key
latin:keySpec="៌"
latin:keyHintLabel="×"
- latin:moreKeys="×"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="×" />
<!-- U+17CE: "៎" KHMER SIGN KAKABAT -->
- <Key
- latin:keySpec="៎"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="៎" />
</case>
<default>
<!-- U+17E1: "១" KHMER DIGIT ONE
@@ -102,94 +95,82 @@
latin:keySpec="១"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
- latin:moreKeys="៱"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៱" />
<!-- U+17E2: "២" KHMER DIGIT TWO
U+17F2: "៲" KHMER SYMBOL LEK ATTAK PII -->
<Key
latin:keySpec="២"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
- latin:moreKeys="៲"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៲" />
<!-- U+17E3: "៣" KHMER DIGIT THREE
U+17F3: "៳" KHMER SYMBOL LEK ATTAK BEI -->
<Key
latin:keySpec="៣"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="៳"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៳" />
<!-- U+17E4: "៤" KHMER DIGIT FOUR
U+17F4: "៴" KHMER SYMBOL LEK ATTAK BUON -->
<Key
latin:keySpec="៤"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
- latin:moreKeys="៴"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៴" />
<!-- U+17E5: "៥" KHMER DIGIT FIVE
U+17F5: "៵" KHMER SYMBOL LEK ATTAK PRAM -->
<Key
latin:keySpec="៥"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
- latin:moreKeys="៵"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៵" />
<!-- U+17E6: "៦" KHMER DIGIT SIX
U+17F6: "៶" KHMER SYMBOL LEK ATTAK PRAM-MUOY -->
<Key
latin:keySpec="៦"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="៶"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៶" />
<!-- U+17E7: "៧" KHMER DIGIT SEVEN
U+17F7: "៷" KHMER SYMBOL LEK ATTAK PRAM-PII -->
<Key
latin:keySpec="៧"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
- latin:moreKeys="៷"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៷" />
<!-- U+17E8: "៨" KHMER DIGIT EIGHT
U+17F8: "៸" KHMER SYMBOL LEK ATTAK PRAM-BEI -->
<Key
latin:keySpec="៨"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="៸"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៸" />
<!-- U+17E9: "៩" KHMER DIGIT NINE
U+17F9: "៹" KHMER SYMBOL LEK ATTAK PRAM-BUON -->
<Key
latin:keySpec="៩"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
- latin:moreKeys="៹"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៹" />
<!-- U+17E0: "០" KHMER DIGIT ZERO
U+17F0: "៰" KHMER SYMBOL LEK ATTAK SON -->
<Key
latin:keySpec="០"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0"
- latin:moreKeys="៰"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៰" />
<!-- U+17A5: "ឥ" KHMER INDEPENDENT VOWEL QI
U+17A6: "ឦ" KHMER INDEPENDENT VOWEL QII -->
<Key
latin:keySpec="ឥ"
latin:keyHintLabel="ឦ"
- latin:moreKeys=",ឦ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys=",ឦ" />
<!-- U+17B2: "áž²" KHMER INDEPENDENT VOWEL QOO TYPE TWO
U+17B1: "áž±" KHMER INDEPENDENT VOWEL QOO TYPE ONE -->
<Key
latin:keySpec="ឲ"
latin:keyHintLabel="ឱ"
- latin:moreKeys="ឱ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ឱ" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_khmer2.xml b/java/res/xml/rowkeys_khmer2.xml
index 4146895f71..04ca1e0df8 100644
--- a/java/res/xml/rowkeys_khmer2.xml
+++ b/java/res/xml/rowkeys_khmer2.xml
@@ -18,117 +18,70 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+1788: "ឈ" KHMER LETTER CHO
U+17DC: "ៜ" KHMER SIGN AVAKRAHASANYA -->
<Key
latin:keySpec="ឈ"
latin:keyHintLabel="ៜ"
- latin:moreKeys="ៜ"
- latin:keyLabelFlags="fontNormal|autoScale" />
+ latin:moreKeys="ៜ" />
<!-- U+17BA: "ឺ" KHMER VOWEL SIGN YY
U+17DD: "áŸ" KHMER SIGN ATTHACAN -->
<Key
latin:keySpec="ឺ"
latin:keyHintLabel="៝"
latin:keyHintLabelVerticalAdjustment="40%"
- latin:moreKeys="៝"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="៝" />
<!-- U+17C2: "ែ" KHMER VOWEL SIGN AE -->
- <Key
- latin:keySpec="ែ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ែ" />
<!-- U+17AC: "ឬ" KHMER INDEPENDENT VOWEL RYY
U+17AB: "áž«" KHMER INDEPENDENT VOWEL RY -->
<Key
latin:keySpec="ឬ"
latin:keyHintLabel="ឫ"
- latin:moreKeys="ឫ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ឫ" />
<!-- U+1791: "áž‘" KHMER LETTER TO -->
- <Key
- latin:keySpec="ទ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ទ" />
<!-- U+17BD: "áž½" KHMER VOWEL SIGN UA -->
- <Key
- latin:keySpec="ួ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ួ" />
<!-- U+17BC: "áž¼" KHMER VOWEL SIGN UU -->
- <Key
- latin:keySpec="ូ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ូ" />
<!-- U+17B8: "ី" KHMER VOWEL SIGN II -->
- <Key
- latin:keySpec="ី"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ី" />
<!-- U+17C5: "ៅ" KHMER VOWEL SIGN AU -->
- <Key
- latin:keySpec="ៅ"
- latin:keyLabelFlags="fontNormal|autoScale" />
+ <Key latin:keySpec="ៅ" />
<!-- U+1797: "áž—" KHMER LETTER PHO -->
- <Key
- latin:keySpec="ភ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ភ" />
<!-- U+17BF: "áž¿" KHMER VOWEL SIGN YA -->
- <Key
- latin:keySpec="ឿ"
- latin:keyLabelFlags="fontNormal|autoScale" />
+ <Key latin:keySpec="ឿ" />
<!-- U+17B0: "áž°" KHMER INDEPENDENT VOWEL QAI -->
- <Key
- latin:keySpec="ឰ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ឰ" />
</case>
<default>
<!-- U+1786: "ឆ" KHMER LETTER CHA -->
- <Key
- latin:keySpec="ឆ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ឆ" />
<!-- U+17B9: "áž¹" KHMER VOWEL SIGN Y -->
- <Key
- latin:keySpec="ឹ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ឹ" />
<!-- U+17C1: "áŸ" KHMER VOWEL SIGN E -->
- <Key
- latin:keySpec="េ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="េ" />
<!-- U+179A: "ážš" KHMER LETTER RO -->
- <Key
- latin:keySpec="រ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="រ" />
<!-- U+178F: "áž" KHMER LETTER TA -->
- <Key
- latin:keySpec="ត"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ត" />
<!-- U+1799: "áž™" KHMER LETTER YO -->
- <Key
- latin:keySpec="យ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="យ" />
<!-- U+17BB: "áž»" KHMER VOWEL SIGN U -->
- <Key
- latin:keySpec="ុ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ុ" />
<!-- U+17B7: "áž·" KHMER VOWEL SIGN I -->
- <Key
- latin:keySpec="ិ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ិ" />
<!-- U+17C4: "ោ" KHMER VOWEL SIGN OO -->
- <Key
- latin:keySpec="ោ"
- latin:keyLabelFlags="fontNormal|autoScale" />
+ <Key latin:keySpec="ោ" />
<!-- U+1795: "áž•" KHMER LETTER PHA -->
- <Key
- latin:keySpec="ផ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ផ" />
<!-- U+17C0: "ៀ" KHMER VOWEL SIGN IE -->
- <Key
- latin:keySpec="ៀ"
- latin:keyLabelFlags="fontNormal|autoScale" />
+ <Key latin:keySpec="ៀ" />
<!-- U+17AA: "ឪ" KHMER INDEPENDENT VOWEL QUUV
U+17A7: "ឧ" KHMER INDEPENDENT VOWEL QU
U+17B1: "áž±" KHMER INDEPENDENT VOWEL QOO TYPE ONE
@@ -138,8 +91,7 @@
<Key
latin:keySpec="ឪ"
latin:keyHintLabel="ឧ"
- latin:moreKeys="ឧ,ឱ,ឳ,ឩ,ឨ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ឧ,ឱ,ឳ,ឩ,ឨ" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_khmer3.xml b/java/res/xml/rowkeys_khmer3.xml
index 5e6d01fb29..c2db364494 100644
--- a/java/res/xml/rowkeys_khmer3.xml
+++ b/java/res/xml/rowkeys_khmer3.xml
@@ -18,121 +18,76 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+17B6/U+17C6: "ាំ" KHMER VOWEL SIGN AA/KHMER SIGN NIKAHIT -->
<Key
latin:keySpec="ាំ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+17C3: "ៃ" KHMER VOWEL SIGN AI -->
- <Key
- latin:keySpec="ៃ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ៃ" />
<!-- U+178C: "ឌ" KHMER LETTER DO -->
- <Key
- latin:keySpec="ឌ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ឌ" />
<!-- U+1792: "áž’" KHMER LETTER THO -->
- <Key
- latin:keySpec="ធ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ធ" />
<!-- U+17A2: "អ" KHMER LETTER QA -->
- <Key
- latin:keySpec="អ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="អ" />
<!-- U+17C7: "ះ" KHMER SIGN REAHMUK
U+17C8: "ៈ" KHMER SIGN YUUKALEAPINTU -->
<Key
latin:keySpec="ះ"
latin:keyHintLabel="ៈ"
- latin:moreKeys="ៈ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ៈ" />
<!-- U+1789: "ញ" KHMER LETTER NYO -->
- <Key
- latin:keySpec="ញ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ញ" />
<!-- U+1782: "áž‚" KHMER LETTER KO
U+179D: "áž" KHMER LETTER SHA -->
<Key
latin:keySpec="គ"
latin:keyHintLabel="ឝ"
- latin:moreKeys="ឝ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ឝ" />
<!-- U+17A1: "áž¡" KHMER LETTER LA -->
- <Key
- latin:keySpec="ឡ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ឡ" />
<!-- U+17C4/U+17C7: "ោះ" KHMER VOWEL SIGN OO/KHMER SIGN REAHMUK -->
<Key
latin:keySpec="ោះ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+ latin:keyLabelFlags="followKeyLetterRatio|autoScale" />
<!-- U+17C9: "៉" KHMER SIGN MUUSIKATOAN -->
- <Key
- latin:keySpec="៉"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="៉" />
<!-- U+17AF: "ឯ" KHMER INDEPENDENT VOWEL QE -->
- <Key
- latin:keySpec="ឯ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ឯ" />
</case>
<default>
<!-- U+17B6: "ា" KHMER VOWEL SIGN AA -->
- <Key
- latin:keySpec="ា"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ា" />
<!-- U+179F: "ស" KHMER LETTER SA -->
- <Key
- latin:keySpec="ស"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ស" />
<!-- U+178A: "ដ" KHMER LETTER DA -->
- <Key
- latin:keySpec="ដ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ដ" />
<!-- U+1790: "áž" KHMER LETTER THA -->
- <Key
- latin:keySpec="ថ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ថ" />
<!-- U+1784: "áž„" KHMER LETTER NGO -->
- <Key
- latin:keySpec="ង"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ង" />
<!-- U+17A0: "áž " KHMER LETTER HA -->
- <Key
- latin:keySpec="ហ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ហ" />
<!-- U+17D2: "្" KHMER SIGN COENG -->
- <Key
- latin:keySpec="្"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="្" />
<!-- U+1780: "ក" KHMER LETTER KA -->
- <Key
- latin:keySpec="ក"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ក" />
<!-- U+179B: "áž›" KHMER LETTER LO -->
- <Key
- latin:keySpec="ល"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ល" />
<!-- U+17BE: "áž¾" KHMER VOWEL SIGN OE -->
- <Key
- latin:keySpec="ើ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ើ" />
<!-- U+17CB: "់" KHMER SIGN BANTOC -->
- <Key
- latin:keySpec="់"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="់" />
<!-- U+17AE: "áž®" KHMER INDEPENDENT VOWEL LYY
U+17AD: "áž" KHMER INDEPENDENT VOWEL LY
U+17B0: "áž°" KHMER INDEPENDENT VOWEL QAI -->
<Key
latin:keySpec="ឮ"
latin:keyHintLabel="ឭ"
- latin:moreKeys="ឭ,ឰ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ឭ,ឰ" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_khmer4.xml b/java/res/xml/rowkeys_khmer4.xml
index 5523d86b7a..70bdcf1bb0 100644
--- a/java/res/xml/rowkeys_khmer4.xml
+++ b/java/res/xml/rowkeys_khmer4.xml
@@ -18,96 +18,62 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+178D: "áž" KHMER LETTER TTHO -->
- <Key
- latin:keySpec="ឍ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ឍ" />
<!-- U+1783: "ឃ" KHMER LETTER KHO -->
- <Key
- latin:keySpec="ឃ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ឃ" />
<!-- U+1787: "ជ" KHMER LETTER CO -->
- <Key
- latin:keySpec="ជ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ជ" />
<!-- U+17C1/U+17C7: "áŸáŸ‡" KHMER VOWEL SIGN E/KHMER SIGN REAHMUK -->
<Key
latin:keySpec="េះ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio|autoScale" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+1796: "áž–" KHMER LETTER PO
U+179E: "ážž" KHMER LETTER SSO -->
<Key
latin:keySpec="ព"
latin:keyHintLabel="ឞ"
- latin:moreKeys="ឞ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ឞ" />
<!-- U+178E: "ណ" KHMER LETTER NNO -->
- <Key
- latin:keySpec="ណ"
- latin:keyLabelFlags="fontNormal|autoScale" />
+ <Key latin:keySpec="ណ" />
<!-- U+17C6: "ំ" KHMER SIGN NIKAHIT -->
- <Key
- latin:keySpec="ំ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ំ" />
<!-- U+17BB/U+17C7: "ុះ" KHMER VOWEL SIGN U/KHMER SIGN REAHMUK -->
<Key
latin:keySpec="ុះ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+17D5: "៕" KHMER SIGN BARIYOOSAN -->
+ <Key latin:keySpec="៕" />
<Key
- latin:keySpec="៕"
- latin:keyLabelFlags="fontNormal" />
- <Key
- latin:keySpec="\?" />
+ latin:keySpec="\?"
+ latin:keyLabelFlags="fontDefault" />
</case>
<default>
<!-- U+178B: "áž‹" KHMER LETTER TTHA -->
- <Key
- latin:keySpec="ឋ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ឋ" />
<!-- U+1781: "áž" KHMER LETTER KHA -->
- <Key
- latin:keySpec="ខ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ខ" />
<!-- U+1785: "áž…" KHMER LETTER CA -->
- <Key
- latin:keySpec="ច"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ច" />
<!-- U+179C: "វ" KHMER LETTER VO -->
- <Key
- latin:keySpec="វ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="វ" />
<!-- U+1794: "áž”" KHMER LETTER BA -->
- <Key
- latin:keySpec="ប"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ប" />
<!-- U+1793: "áž“" KHMER LETTER NO -->
- <Key
- latin:keySpec="ន"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ន" />
<!-- U+1798: "ម" KHMER LETTER MO -->
- <Key
- latin:keySpec="ម"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ម" />
<!-- U+17BB/U+17C6: "ុំ" KHMER VOWEL SIGN U/KHMER SIGN NIKAHIT -->
<Key
latin:keySpec="ុំ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+17D4: "។" KHMER SIGN KHAN -->
- <Key
- latin:keySpec="។"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="។" />
<!-- U+17CA: "៊" KHMER SIGN TRIISAP -->
- <Key
- latin:keySpec="៊"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="៊" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_lao1.xml b/java/res/xml/rowkeys_lao1.xml
index a5085a540f..f88d5fd662 100644
--- a/java/res/xml/rowkeys_lao1.xml
+++ b/java/res/xml/rowkeys_lao1.xml
@@ -18,61 +18,35 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0ED1: "໑" LAO DIGIT ONE -->
- <Key
- latin:keySpec="໑"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໑" />
<!-- U+0ED2: "à»’" LAO DIGIT TWO -->
- <Key
- latin:keySpec="໒"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໒" />
<!-- U+0ED3: "໓" LAO DIGIT THREE -->
- <Key
- latin:keySpec="໓"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໓" />
<!-- U+0ED4: "à»”" LAO DIGIT FOUR -->
- <Key
- latin:keySpec="໔"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໔" />
<!-- U+0ECC: "໌" LAO CANCELLATION MARK -->
- <Key
- latin:keySpec="໌"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໌" />
<!-- U+0EBC: "ຼ" LAO SEMIVOWEL SIGN LO -->
- <Key
- latin:keySpec="ຼ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຼ" />
<!-- U+0ED5: "໕" LAO DIGIT FIVE -->
- <Key
- latin:keySpec="໕"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໕" />
<!-- U+0ED6: "à»–" LAO DIGIT SIX -->
- <Key
- latin:keySpec="໖"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໖" />
<!-- U+0ED7: "à»—" LAO DIGIT SEVEN -->
- <Key
- latin:keySpec="໗"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໗" />
<!-- U+0ED8: "໘" LAO DIGIT EIGHT -->
- <Key
- latin:keySpec="໘"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໘" />
<!-- U+0ED9: "à»™" LAO DIGIT NINE -->
- <Key
- latin:keySpec="໙"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໙" />
<!-- U+0ECD/U+0EC8: "à»à»ˆ" LAO NIGGAHITA/LAO TONE MAI EK -->
<Key
latin:keySpec="ໍ່"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</case>
<default>
<!-- U+0EA2: "ຢ" LAO LETTER YO
@@ -81,84 +55,69 @@
latin:keySpec="ຢ"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
- latin:moreKeys="໑"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="໑" />
<!-- U+0E9F: "ຟ" LAO LETTER FO SUNG
U+0ED2: "à»’" LAO DIGIT TWO -->
<Key
latin:keySpec="ຟ"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
- latin:moreKeys="໒"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="໒" />
<!-- U+0EC2: "ໂ" LAO VOWEL SIGN O
U+0ED3: "໓" LAO DIGIT THREE -->
<Key
latin:keySpec="ໂ"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="໓"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="໓" />
<!-- U+0E96: "ຖ" LAO LETTER THO SUNG
U+0ED4: "à»”" LAO DIGIT FOUR -->
<Key
latin:keySpec="ຖ"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
- latin:moreKeys="໔"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="໔" />
<!-- U+0EB8: "ຸ" LAO VOWEL SIGN U -->
- <Key
- latin:keySpec="ຸ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຸ" />
<!-- U+0EB9: "ູ" LAO VOWEL SIGN UU -->
- <Key
- latin:keySpec="ູ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ູ" />
<!-- U+0E84: "ຄ" LAO LETTER KHO TAM
U+0ED5: "໕" LAO DIGIT FIVE -->
<Key
latin:keySpec="ຄ"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
- latin:moreKeys="໕"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="໕" />
<!-- U+0E95: "ຕ" LAO LETTER TO
U+0ED6: "à»–" LAO DIGIT SIX -->
<Key
latin:keySpec="ຕ"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="໖"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="໖" />
<!-- U+0E88: "ຈ" LAO LETTER CO
U+0ED7: "à»—" LAO DIGIT SEVEN -->
<Key
latin:keySpec="ຈ"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
- latin:moreKeys="໗"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="໗" />
<!-- U+0E82: "ຂ" LAO LETTER KHO SUNG
U+0ED8: "໘" LAO DIGIT EIGHT -->
<Key
latin:keySpec="ຂ"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="໘"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="໘" />
<!-- U+0E8A: "ຊ" LAO LETTER SO TAM
U+0ED9: "à»™" LAO DIGIT NINE -->
<Key
latin:keySpec="ຊ"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
- latin:moreKeys="໙"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="໙" />
<!-- U+0ECD: "à»" LAO NIGGAHITA -->
- <Key
- latin:keySpec="ໍ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ໍ" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_lao2.xml b/java/res/xml/rowkeys_lao2.xml
index 67c474f984..46b6395d72 100644
--- a/java/res/xml/rowkeys_lao2.xml
+++ b/java/res/xml/rowkeys_lao2.xml
@@ -18,110 +18,78 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0EBB/U+0EC9: "" LAO VOWEL SIGN MAI KON/LAO TONE MAI THO -->
<Key
latin:keySpec="ົ້"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0ED0: "à»" LAO DIGIT ZERO -->
- <Key
- latin:keySpec="໐"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໐" />
<!-- U+0EB3/U+0EC9: "ຳ້" LAO VOWEL SIGN AM/LAO TONE MAI THO -->
<Key
latin:keySpec="ຳ້"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<Key
- latin:keySpec="_" />
+ latin:keySpec="_"
+ latin:keyLabelFlags="fontDefault" />
<Key
- latin:keySpec="+" />
+ latin:keySpec="+"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+0EB4/U+0EC9: "ິ້" LAO VOWEL SIGN I/LAO TONE MAI THO -->
<Key
latin:keySpec="ິ້"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0EB5/U+0EC9: "ີ້" LAO VOWEL SIGN II/LAO TONE MAI THO -->
<Key
latin:keySpec="ີ້"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0EA3: "ຣ" LAO LETTER LO LING -->
- <Key
- latin:keySpec="ຣ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຣ" />
<!-- U+0EDC: "ໜ" LAO HO NO -->
- <Key
- latin:keySpec="ໜ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ໜ" />
<!-- U+0EBD: "ຽ" LAO SEMIVOWEL SIGN NYO -->
- <Key
- latin:keySpec="ຽ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຽ" />
<!-- U+0EAB/U+0EBC: "" LAO LETTER HO SUNG/LAO SEMIVOWEL SIGN LO -->
<Key
latin:keySpec="ຫຼ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+201D: "â€" RIGHT DOUBLE QUOTATION MARK -->
<Key
- latin:keySpec="”" />
+ latin:keySpec="”"
+ latin:keyLabelFlags="fontDefault" />
</case>
<default>
<!-- U+0EBB: "ົ" LAO VOWEL SIGN MAI KON -->
- <Key
- latin:keySpec="ົ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ົ" />
<!-- U+0EC4: "ໄ" LAO VOWEL SIGN AI
U+0ED0: "à»" LAO DIGIT ZERO -->
<Key
latin:keySpec="ໄ"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0"
- latin:moreKeys="໐"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="໐" />
<!-- U+0EB3: "ຳ" LAO VOWEL SIGN AM -->
- <Key
- latin:keySpec="ຳ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຳ" />
<!-- U+0E9E: "ພ" LAO LETTER PHO TAM -->
- <Key
- latin:keySpec="ພ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ພ" />
<!-- U+0EB0: "ະ" LAO VOWEL SIGN A -->
- <Key
- latin:keySpec="ະ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ະ" />
<!-- U+0EB4: "ິ" LAO VOWEL SIGN I -->
- <Key
- latin:keySpec="ິ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ິ" />
<!-- U+0EB5: "ີ" LAO VOWEL SIGN II -->
- <Key
- latin:keySpec="ີ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ີ" />
<!-- U+0EAE: "ຮ" LAO LETTER HO TAM -->
- <Key
- latin:keySpec="ຮ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຮ" />
<!-- U+0E99: "ນ" LAO LETTER NO -->
- <Key
- latin:keySpec="ນ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ນ" />
<!-- U+0E8D: "àº" LAO LETTER NYO -->
- <Key
- latin:keySpec="ຍ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຍ" />
<!-- U+0E9A: "ບ" LAO LETTER BO -->
- <Key
- latin:keySpec="ບ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ບ" />
<!-- U+0EA5: "ລ" LAO LETTER LO LOOT -->
- <Key
- latin:keySpec="ລ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ລ" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_lao3.xml b/java/res/xml/rowkeys_lao3.xml
index 172716ddec..ab3e25131f 100644
--- a/java/res/xml/rowkeys_lao3.xml
+++ b/java/res/xml/rowkeys_lao3.xml
@@ -18,93 +18,73 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0EB1/U+0EC9: "ັ້" LAO VOWEL SIGN MAI KAN/LAO TONE MAI THO -->
<Key
latin:keySpec="ັ້"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<Key
- latin:keySpec=";" />
+ latin:keySpec=";"
+ latin:keyLabelFlags="fontDefault" />
<Key
- latin:keySpec="." />
+ latin:keySpec="."
+ latin:keyLabelFlags="fontDefault" />
<Key
- latin:keySpec="," />
+ latin:keySpec=","
+ latin:keyLabelFlags="fontDefault" />
<Key
- latin:keySpec=":" />
+ latin:keySpec=":"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+0ECA: "໊" LAO TONE MAI TI -->
- <Key
- latin:keySpec="໊"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="໊" />
<!-- U+0ECB: "໋" LAO TONE MAI CATAWA -->
+ <Key latin:keySpec="໋" />
<Key
- latin:keySpec="໋"
- latin:keyLabelFlags="fontNormal" />
- <Key
- latin:keySpec="!" />
+ latin:keySpec="!"
+ latin:keyLabelFlags="fontDefault" />
<Key
- latin:keySpec="\?" />
+ latin:keySpec="\?"
+ latin:keyLabelFlags="fontDefault" />
<Key
- latin:keySpec="%" />
+ latin:keySpec="%"
+ latin:keyLabelFlags="fontDefault" />
<Key
- latin:keySpec="=" />
+ latin:keySpec="="
+ latin:keyLabelFlags="fontDefault" />
<!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
<Key
- latin:keySpec="“" />
+ latin:keySpec="“"
+ latin:keyLabelFlags="fontDefault" />
</case>
<default>
<!-- U+0EB1: "ັ" LAO VOWEL SIGN MAI KAN -->
- <Key
- latin:keySpec="ັ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ັ" />
<!-- U+0EAB: "ຫ" LAO LETTER HO SUNG -->
- <Key
- latin:keySpec="ຫ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຫ" />
<!-- U+0E81: "àº" LAO LETTER KO -->
- <Key
- latin:keySpec="ກ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ກ" />
<!-- U+0E94: "ດ" LAO LETTER DO -->
- <Key
- latin:keySpec="ດ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ດ" />
<!-- U+0EC0: "ເ" LAO VOWEL SIGN E -->
- <Key
- latin:keySpec="ເ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ເ" />
<!-- U+0EC9: "້" LAO TONE MAI THO -->
- <Key
- latin:keySpec="້"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="້" />
<!-- U+0EC8: "່" LAO TONE MAI EK -->
- <Key
- latin:keySpec="່"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="່" />
<!-- U+0EB2: "າ" LAO VOWEL SIGN AA -->
- <Key
- latin:keySpec="າ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="າ" />
<!-- U+0EAA: "ສ" LAO LETTER SO SUNG -->
- <Key
- latin:keySpec="ສ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ສ" />
<!-- U+0EA7: "ວ" LAO LETTER WO -->
- <Key
- latin:keySpec="ວ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ວ" />
<!-- U+0E87: "ງ" LAO LETTER NGO -->
- <Key
- latin:keySpec="ງ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ງ" />
<!-- U+201C: "“" LEFT DOUBLE QUOTATION MARK -->
<Key
- latin:keySpec="“" />
+ latin:keySpec="“"
+ latin:keyLabelFlags="fontDefault" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_lao4.xml b/java/res/xml/rowkeys_lao4.xml
index ed4b9b1f10..5beb1cbcb0 100644
--- a/java/res/xml/rowkeys_lao4.xml
+++ b/java/res/xml/rowkeys_lao4.xml
@@ -18,86 +18,60 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+20AD: "â‚" KIP SIGN -->
<Key
- latin:keySpec="₭" />
+ latin:keySpec="₭"
+ latin:keyLabelFlags="fontDefault" />
<Key
- latin:keySpec="(" />
- <!-- U+0EAF: "ຯ" LAO ELLIPSIS -->
+ latin:keySpec="("
+ latin:keyLabelFlags="fontDefault" />
+ <Key latin:keySpec="ຯ" />
<Key
- latin:keySpec="ຯ"
- latin:keyLabelFlags="fontNormal" />
- <Key
- latin:keySpec="\@" />
+ latin:keySpec="\@"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+0EB6/U+0EC9: "ຶ້" LAO VOWEL SIGN Y/LAO TONE MAI THO -->
<Key
latin:keySpec="ຶ້"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0EB7/U+0EC9: "ື້" LAO VOWEL SIGN YY/LAO TONE MAI THO -->
<Key
latin:keySpec="ື້"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0EC6: "ໆ" LAO KO LA -->
- <Key
- latin:keySpec="ໆ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ໆ" />
<!-- U+0EDD: "à»" LAO HO MO -->
+ <Key latin:keySpec="ໝ" />
<Key
- latin:keySpec="ໝ"
- latin:keyLabelFlags="fontNormal" />
+ latin:keySpec="$"
+ latin:keyLabelFlags="fontDefault" />
<Key
- latin:keySpec="$" />
- <Key
- latin:keySpec=")" />
+ latin:keySpec=")"
+ latin:keyLabelFlags="fontDefault" />
</case>
<default>
<!-- U+0E9C: "ຜ" LAO LETTER PHO SUNG -->
- <Key
- latin:keySpec="ຜ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຜ" />
<!-- U+0E9B: "ປ" LAO LETTER PO -->
- <Key
- latin:keySpec="ປ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ປ" />
<!-- U+0EC1: "à»" LAO VOWEL SIGN EI -->
- <Key
- latin:keySpec="ແ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ແ" />
<!-- U+0EAD: "àº" LAO LETTER O -->
- <Key
- latin:keySpec="ອ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ອ" />
<!-- U+0EB6: "ຶ" LAO VOWEL SIGN Y -->
- <Key
- latin:keySpec="ຶ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຶ" />
<!-- U+0EB7: "ື" LAO VOWEL SIGN YY -->
- <Key
- latin:keySpec="ື"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ື" />
<!-- U+0E97: "ທ" LAO LETTER THO TAM -->
- <Key
- latin:keySpec="ທ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ທ" />
<!-- U+0EA1: "ມ" LAO LETTER MO -->
- <Key
- latin:keySpec="ມ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ມ" />
<!-- U+0EC3: "ໃ" LAO VOWEL SIGN AY -->
- <Key
- latin:keySpec="ໃ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ໃ" />
<!-- U+0E9D: "àº" LAO LETTER FO TAM -->
- <Key
- latin:keySpec="ຝ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ຝ" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_marathi1.xml b/java/res/xml/rowkeys_marathi1.xml
index 810e71e3cb..596664bc66 100644
--- a/java/res/xml/rowkeys_marathi1.xml
+++ b/java/res/xml/rowkeys_marathi1.xml
@@ -18,14 +18,11 @@
*/
-->
-<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">
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
<!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAu"
@@ -34,8 +31,7 @@
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
<!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAi"
@@ -44,8 +40,7 @@
<!-- 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_aa" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
<!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAa"
@@ -54,8 +49,7 @@
<!-- 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_ii" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
<!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignIi"
@@ -64,8 +58,7 @@
<!-- 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_uu" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
<!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignUu"
@@ -78,15 +71,13 @@
latin:keySpec="ब"
latin:moreKeys="भ,%"
latin:keyHintLabel="6"
- latin:additionalMoreKeys="६,6"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="६,6" />
<!-- U+0939: "ह" DEVANAGARI LETTER HA
U+096D: "à¥" DEVANAGARI DIGIT SEVEN -->
<Key
latin:keySpec="ह"
latin:keyHintLabel="7"
- latin:additionalMoreKeys="७,7"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="७,7" />
<!-- U+0917: "ग" DEVANAGARI LETTER GA
U+0918: "घ" DEVANAGARI LETTER GHA
U+096E: "८" DEVANAGARI DIGIT EIGHT -->
@@ -94,8 +85,7 @@
latin:keySpec="ग"
latin:moreKeys="घ,%"
latin:keyHintLabel="8"
- latin:additionalMoreKeys="८,8"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="८,8" />
<!-- U+0926: "द" DEVANAGARI LETTER DA
U+0927: "ध" DEVANAGARI LETTER DHA
U+096F: "९" DEVANAGARI DIGIT NINE -->
@@ -103,8 +93,7 @@
latin:keySpec="द"
latin:moreKeys="ध,%"
latin:keyHintLabel="9"
- latin:additionalMoreKeys="९,9"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="९,9" />
<!-- U+091C: "ज" DEVANAGARI LETTER JA
U+091D: "à¤" DEVANAGARI LETTER JHA
U+091C/U+094D/U+091E: "जà¥à¤ž" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER JHA -->
@@ -112,12 +101,10 @@
latin:keySpec="ज"
latin:moreKeys="झ,ज्ञ,%"
latin:keyHintLabel="0"
- latin:additionalMoreKeys="०,0"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="०,0" />
<!-- U+0921: "ड" DEVANAGARI LETTER DDA
U+0922: "ढ" DEVANAGARI LETTER DDHA -->
<Key
latin:keySpec="ड"
- latin:moreKeys="ढ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ढ" />
</merge>
diff --git a/java/res/xml/rowkeys_marathi2.xml b/java/res/xml/rowkeys_marathi2.xml
index f95091529e..060822ee50 100644
--- a/java/res/xml/rowkeys_marathi2.xml
+++ b/java/res/xml/rowkeys_marathi2.xml
@@ -18,83 +18,64 @@
*/
-->
-<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">
<!-- 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_o" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignO" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+ <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
<!-- 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_i" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignI" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
<!-- 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_u" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignU" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
<!-- U+092A: "प" DEVANAGARI LETTER PA
U+092B: "फ" DEVANAGARI LETTER PHA -->
<Key
latin:keySpec="प"
- latin:moreKeys="फ"
- latin:keyLabelFlags="fontNormal" />
+ 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_vowel_sign_vocalic_r" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
<!-- U+0930: "र" DEVANAGARI LETTER RA -->
<Key
latin:keySpec="र"
- latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" />
<!-- U+0915: "क" DEVANAGARI LETTER KA
U+0916: "ख" DEVANAGARI LETTER KHA -->
<Key
latin:keySpec="क"
- latin:moreKeys="ख"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ख" />
<!-- U+0924: "त" DEVANAGARI LETTER TA
U+0925: "थ" DEVANAGARI LETTER THA
U+0924/U+094D/U+0930: "तà¥à¤°" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
<Key
latin:keySpec="त"
- latin:moreKeys="थ,त्र"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="थ,त्र" />
<!-- U+091A: "च" DEVANAGARI LETTER CA
U+091B: "छ" DEVANAGARI LETTER CHA -->
<Key
latin:keySpec="च"
- latin:moreKeys="छ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="छ" />
<!-- U+091F: "ट" DEVANAGARI LETTER TTA
U+0920: "ठ" DEVANAGARI LETTER TTHA -->
<Key
latin:keySpec="ट"
- latin:moreKeys="ठ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ठ" />
</merge>
diff --git a/java/res/xml/rowkeys_marathi3.xml b/java/res/xml/rowkeys_marathi3.xml
index 17fc5ac779..661e79672c 100644
--- a/java/res/xml/rowkeys_marathi3.xml
+++ b/java/res/xml/rowkeys_marathi3.xml
@@ -18,66 +18,49 @@
*/
-->
-<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">
<!-- 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_candra_o" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_o" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraO" />
<!-- 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_candra_e" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignCandraE" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_candra_e" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignCandraE" />
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
<!-- U+092E: "म" DEVANAGARI LETTER MA -->
- <Key
- latin:keySpec="म"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="म" />
<!-- U+0928: "न" DEVANAGARI LETTER NA
U+0923: "ण" DEVANAGARI LETTER NNA
U+091E: "ञ" DEVANAGARI LETTER NYA
U+0919: "ङ" DEVANAGARI LETTER NGA -->
<Key
latin:keySpec="न"
- latin:moreKeys="ण,ञ,ङ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ण,ञ,ङ" />
<!-- U+0935: "व" DEVANAGARI LETTER VA -->
- <Key
- latin:keySpec="व"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="व" />
<!-- U+0932: "ल" DEVANAGARI LETTER LA
U+0933: "ळ" DEVANAGARI LETTER LLA -->
<Key
latin:keySpec="ल"
- latin:moreKeys="ळ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ळ" />
<!-- U+0938: "स" DEVANAGARI LETTER SA
U+0936: "श" DEVANAGARI LETTER SHA
U+0937: "ष" DEVANAGARI LETTER SSA
U+0936/U+094D/U+0930: "शà¥à¤°" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
<Key
latin:keySpec="स"
- latin:moreKeys="श,ष,श्र"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="श,ष,श्र" />
<!-- U+092F: "य" DEVANAGARI LETTER YA -->
- <Key
- latin:keySpec="य"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="य" />
<!-- U+0915/U+094D/U+0937: "कà¥à¤·" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA -->
<Key
latin:keySpec="क्ष"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</merge>
diff --git a/java/res/xml/rowkeys_myanmar1.xml b/java/res/xml/rowkeys_myanmar1.xml
index b7c820922b..117007431b 100644
--- a/java/res/xml/rowkeys_myanmar1.xml
+++ b/java/res/xml/rowkeys_myanmar1.xml
@@ -18,116 +18,88 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+1027: "ဧ" MYANMAR LETTER E -->
- <Key
- latin:keySpec="ဧ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဧ" />
<!-- U+104F: "á" MYANMAR SYMBOL GENITIVE -->
- <Key
- latin:keySpec="၏"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="၏" />
<!-- U+1024: "ဤ" MYANMAR LETTER II -->
- <Key
- latin:keySpec="ဤ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဤ" />
<!-- U+1023: "ဣ" MYANMAR LETTER I -->
- <Key
- latin:keySpec="ဣ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဣ" />
<!-- U+104E: "áŽ" MYANMAR SYMBOL AFOREMENTIONED -->
- <Key
- latin:keySpec="၎"
- latin:keyLabelFlags="fontNormal" />
+ <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="fontNormal|followKeyLetterRatio|autoScale" />
+ latin:keyLabelFlags="followKeyLetterRatio|autoScale" />
<!-- U+1029: "ဩ" MYANMAR LETTER O -->
<Key
latin:keySpec="ဩ"
- latin:keyLabelFlags="fontNormal|autoScale" />
+ latin:keyLabelFlags="autoScale" />
<!-- U+102A: "ဪ" MYANMAR LETTER AU -->
<Key
latin:keySpec="ဪ"
- latin:keyLabelFlags="fontNormal|autoScale" />
+ latin:keyLabelFlags="autoScale" />
<!-- U+104D: "á" MYANMAR SYMBOL COMPLETED -->
- <Key
- latin:keySpec="၍"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="၍" />
<!-- U+104C: "áŒ" MYANMAR SYMBOL LOCATIVE -->
- <Key
- latin:keySpec="၌"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="၌" />
</case>
<default>
<!-- U+1041: "á" MYANMAR DIGIT ONE -->
<Key
latin:keySpec="၁"
latin:keyHintLabel="1"
- latin:additionalMoreKeys="1"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="1" />
<!-- U+1042: "á‚" MYANMAR DIGIT TWO -->
<Key
latin:keySpec="၂"
latin:keyHintLabel="2"
- latin:additionalMoreKeys="2"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="2" />
<!-- U+1043: "áƒ" MYANMAR DIGIT THREE -->
<Key
latin:keySpec="၃"
latin:keyHintLabel="3"
- latin:additionalMoreKeys="3"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="3" />
<!-- U+1044: "á„" MYANMAR DIGIT FOUR -->
<Key
latin:keySpec="၄"
latin:keyHintLabel="4"
- latin:additionalMoreKeys="4"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="4" />
<!-- U+1045: "á…" MYANMAR DIGIT FIVE -->
<Key
latin:keySpec="၅"
latin:keyHintLabel="5"
- latin:additionalMoreKeys="5"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="5" />
<!-- U+1046: "á†" MYANMAR DIGIT SIX -->
<Key
latin:keySpec="၆"
latin:keyHintLabel="6"
- latin:additionalMoreKeys="6"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="6" />
<!-- U+1047: "á‡" MYANMAR DIGIT SEVEN -->
<Key
latin:keySpec="၇"
latin:keyHintLabel="7"
- latin:additionalMoreKeys="7"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="7" />
<!-- U+1048: "áˆ" MYANMAR DIGIT EIGHT -->
<Key
latin:keySpec="၈"
latin:keyHintLabel="8"
- latin:additionalMoreKeys="8"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="8" />
<!-- U+1049: "á‰" MYANMAR DIGIT NINE -->
<Key
latin:keySpec="၉"
latin:keyHintLabel="9"
- latin:additionalMoreKeys="9"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="9" />
<!-- U+1040: "á€" MYANMAR DIGIT ZERO -->
<Key
latin:keySpec="၀"
latin:keyHintLabel="0"
- latin:additionalMoreKeys="0"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="0" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_myanmar2.xml b/java/res/xml/rowkeys_myanmar2.xml
index 5f0115f396..d7aca00632 100644
--- a/java/res/xml/rowkeys_myanmar2.xml
+++ b/java/res/xml/rowkeys_myanmar2.xml
@@ -18,95 +18,51 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+1017: "ဗ" MYANMAR LETTER BA -->
- <Key
- latin:keySpec="ဗ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဗ" />
<!-- U+1012: "ဒ" MYANMAR LETTER DA -->
- <Key
- latin:keySpec="ဒ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဒ" />
<!-- U+1013: "ဓ" MYANMAR LETTER DHA -->
- <Key
- latin:keySpec="ဓ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဓ" />
<!-- U+1003: "ဃ" MYANMAR LETTER GHA -->
- <Key
- latin:keySpec="ဃ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဃ" />
<!-- U+100E: "ဎ" MYANMAR LETTER DDHA -->
- <Key
- latin:keySpec="ဎ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဎ" />
<!-- U+103F: "ဿ" MYANMAR LETTER GREAT SA -->
- <Key
- latin:keySpec="ဿ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဿ" />
<!-- U+100F: "á€" MYANMAR LETTER NNA -->
- <Key
- latin:keySpec="ဏ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဏ" />
<!-- U+1008: "ဈ" MYANMAR LETTER JHA -->
- <Key
- latin:keySpec="ဈ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဈ" />
<!-- U+1007: "ဇ" MYANMAR LETTER JA -->
- <Key
- latin:keySpec="ဇ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဇ" />
<!-- U+1002: "ဂ" MYANMAR LETTER GA -->
- <Key
- latin:keySpec="ဂ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဂ" />
</case>
<default>
<!-- U+1006: "ဆ" MYANMAR LETTER CHA -->
- <Key
- latin:keySpec="ဆ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဆ" />
<!-- U+1010: "á€" MYANMAR LETTER TA -->
- <Key
- latin:keySpec="တ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="တ" />
<!-- U+1014: "န" MYANMAR LETTER NA -->
- <Key
- latin:keySpec="န"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="န" />
<!-- U+1019: "မ" MYANMAR LETTER MA -->
- <Key
- latin:keySpec="မ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="မ" />
<!-- U+1021: "အ" MYANMAR LETTER A -->
- <Key
- latin:keySpec="အ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="အ" />
<!-- U+1015: "ပ" MYANMAR LETTER PA -->
- <Key
- latin:keySpec="ပ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ပ" />
<!-- U+1000: "က" MYANMAR LETTER KA -->
- <Key
- latin:keySpec="က"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="က" />
<!-- U+1004: "င" MYANMAR LETTER NGA -->
- <Key
- latin:keySpec="င"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="င" />
<!-- U+101E: "သ" MYANMAR LETTER SA -->
- <Key
- latin:keySpec="သ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="သ" />
<!-- U+1005: "စ" MYANMAR LETTER CA -->
- <Key
- latin:keySpec="စ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="စ" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_myanmar3.xml b/java/res/xml/rowkeys_myanmar3.xml
index 612bcd31b7..c5850689bf 100644
--- a/java/res/xml/rowkeys_myanmar3.xml
+++ b/java/res/xml/rowkeys_myanmar3.xml
@@ -18,106 +18,69 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+101A: "ယ" MYANMAR LETTER YA -->
- <Key
- latin:keySpec="ယ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ယ" />
<!-- U+1039: "္" MYANMAR SIGN VIRAMA -->
- <Key
- latin:keySpec="္"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="္" />
<!-- U+1004/U+103A/U+1039: "င်္င" MYANMAR LETTER NGA/MYANMAR SIGN ASAT/MYANMAR SIGN VIRAMA -->
<Key
latin:keySpec="င်္"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+103E: "ှ" MYANMAR CONSONANT SIGN MEDIAL HA -->
- <Key
- latin:keySpec="ှ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ှ" />
<!-- U+102E: "ီ" MYANMAR VOWEL SIGN II -->
- <Key
- latin:keySpec="ီ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ီ" />
<!-- U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
- <Key
- latin:keySpec="ူ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ူ" />
<!-- U+102B: "ါ" MYANMAR VOWEL SIGN TALL AA -->
- <Key
- latin:keySpec="ါ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ါ" />
<!-- U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
- <Key
- latin:keySpec="ဲ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဲ" />
<!-- U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
- <Key
- latin:keySpec="ံ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ံ" />
<!-- U+101F: "ဟ" MYANMAR LETTER HA -->
- <Key
- latin:keySpec="ဟ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဟ" />
</case>
<default>
<!-- U+1031: "ေ" MYANMAR VOWEL SIGN E -->
- <Key
- latin:keySpec="ေ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ေ" />
<!-- U+103B: "ျ" MYANMAR CONSONANT SIGN MEDIAL YA -->
- <Key
- latin:keySpec="ျ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ျ" />
<!-- U+103C: "ြ" MYANMAR CONSONANT SIGN MEDIAL RA -->
- <Key
- latin:keySpec="ြ"
- latin:keyLabelFlags="fontNormal" />
+ <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="ှ,ွှ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ှ,ွှ" />
<!-- U+102D: "á€" MYANMAR VOWEL SIGN I
U+102E: "ီ" MYANMAR VOWEL SIGN II -->
<Key
latin:keySpec="ိ"
- latin:moreKeys="ီ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ီ" />
<!-- U+102F: "ု" MYANMAR VOWEL SIGN U
U+1030: "ူ" MYANMAR VOWEL SIGN UU -->
<Key
latin:keySpec="ု"
- latin:moreKeys="ူ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ူ" />
<!-- U+102C: "ာ" MYANMAR VOWEL SIGN AA -->
- <Key
- latin:keySpec="ာ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ာ" />
<!-- U+103A: "်" MYANMAR SIGN ASAT
U+1032: "ဲ" MYANMAR VOWEL SIGN AI -->
<Key
latin:keySpec="်"
- latin:moreKeys="ဲ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ဲ" />
<!-- U+1037: "့" MYANMAR SIGN DOT BELOW
U+1036: "ံ" MYANMAR SIGN ANUSVARA -->
<Key
latin:keySpec="့"
- latin:moreKeys="ံ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ံ" />
<!-- U+1038: "း" MYANMAR SIGN VISARGA -->
- <Key
- latin:keySpec="း"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="း" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_myanmar4.xml b/java/res/xml/rowkeys_myanmar4.xml
index 57466c565a..210ebaa8f1 100644
--- a/java/res/xml/rowkeys_myanmar4.xml
+++ b/java/res/xml/rowkeys_myanmar4.xml
@@ -18,83 +18,52 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+1025: "ဥ" MYANMAR LETTER U -->
- <Key
- latin:keySpec="ဥ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဥ" />
<!-- U+1026: "ဦ" MYANMAR LETTER UU -->
- <Key
- latin:keySpec="ဦ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဦ" />
<!-- U+100C: "ဌ" MYANMAR LETTER TTHA -->
- <Key
- latin:keySpec="ဌ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဌ" />
<!-- U+100B: "ဋ" MYANMAR LETTER TTA -->
- <Key
- latin:keySpec="ဋ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဋ" />
<!-- U+100D: "á€" MYANMAR LETTER DDA -->
- <Key
- latin:keySpec="ဍ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဍ" />
<!-- U+1020: "ဠ" MYANMAR LETTER LLA -->
- <Key
- latin:keySpec="ဠ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဠ" />
<!-- U+100B/U+1039/U+100C: "ဋ္ဌ" MYANMAR LETTER TTA/MYANMAR SIGN VIRAMA/MYANMAR LETTER TTHA -->
<Key
latin:keySpec="ဋ္ဌ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ 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="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</case>
<default>
<!-- U+1016: "ဖ" MYANMAR LETTER PHA -->
- <Key
- latin:keySpec="ဖ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဖ" />
<!-- U+1011: "ထ" MYANMAR LETTER THA -->
- <Key
- latin:keySpec="ထ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ထ" />
<!-- U+1001: "á€" MYANMAR LETTER KHA -->
- <Key
- latin:keySpec="ခ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ခ" />
<!-- U+101C: "လ" MYANMAR LETTER LA -->
- <Key
- latin:keySpec="လ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="လ" />
<!-- U+1018: "ဘ" MYANMAR LETTER BHA -->
- <Key
- latin:keySpec="ဘ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဘ" />
<!-- U+100A: "ည" MYANMAR LETTER NNYA
U+1009: "ဉ" MYANMAR LETTER NYA -->
<Key
latin:keySpec="ည"
- latin:moreKeys="ဉ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ဉ" />
<!-- U+101B: "ရ" MYANMAR LETTER RA -->
- <Key
- latin:keySpec="ရ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ရ" />
<!-- U+101D: "á€" MYANMAR LETTER WA -->
- <Key
- latin:keySpec="ဝ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ဝ" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized1.xml b/java/res/xml/rowkeys_nepali_romanized1.xml
index 616b259a3d..67be51bb05 100644
--- a/java/res/xml/rowkeys_nepali_romanized1.xml
+++ b/java/res/xml/rowkeys_nepali_romanized1.xml
@@ -18,89 +18,60 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
- <Key
- latin:keySpec="ठ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ठ" />
<!-- U+0914: "औ" DEVANAGARI LETTER AU -->
- <Key
- latin:keySpec="औ"
- latin:keyLabelFlags="fontNormal" />
+ <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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ai" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignAi" />
<!-- 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_vocalic_r" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
<!-- U+0925: "थ" DEVANAGARI LETTER THA -->
- <Key
- latin:keySpec="थ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="थ" />
<!-- U+091E: "ञ" DEVANAGARI LETTER NYA -->
- <Key
- latin:keySpec="ञ"
- latin:keyLabelFlags="fontNormal" />
+ <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_uu" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignUu" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" />
<!-- 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_ii" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignIi" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" />
<!-- U+0913: "ओ" DEVANAGARI LETTER O -->
- <Key
- latin:keySpec="ओ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ओ" />
<!-- U+092B: "फ" DEVANAGARI LETTER PHA -->
- <Key
- latin:keySpec="फ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="फ" />
<!-- U+0908: "ई" DEVANAGARI LETTER II -->
- <Key
- latin:keySpec="ई"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ई" />
</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_nukta" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_nukta" />
<!-- U+091F: "ट" DEVANAGARI LETTER TTA
U+0967: "१" DEVANAGARI DIGIT ONE -->
<Key
latin:keySpec="ट"
latin:keyHintLabel="1"
latin:additionalMoreKeys="१,1"
- latin:keyStyle="moreKeysDevanagariSignNukta"
- latin:keyLabelFlags="fontNormal" />
+ latin:keyStyle="moreKeysDevanagariSignNukta" />
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_au" />
<!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignAu"
@@ -109,8 +80,7 @@
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
<!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignE"
@@ -121,27 +91,23 @@
<Key
latin:keySpec="र"
latin:keyHintLabel="4"
- latin:additionalMoreKeys="४,4"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="४,4" />
<!-- U+0924: "त" DEVANAGARI LETTER TA
U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
latin:keySpec="त"
latin:keyHintLabel="5"
- latin:additionalMoreKeys="५,5"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="५,5" />
<!-- U+092F: "य" DEVANAGARI LETTER YA
U+096C: "६" DEVANAGARI DIGIT SIX -->
<Key
latin:keySpec="य"
latin:keyHintLabel="6"
- latin:additionalMoreKeys="६,6"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="६,6" />
<!-- 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_u" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
<!-- U+096D: "à¥" DEVANAGARI DIGIT SEVEN -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignU"
@@ -150,8 +116,7 @@
<!-- 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_i" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
<!-- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignI"
@@ -160,8 +125,7 @@
<!-- 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_o" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
<!-- U+096F: "९" DEVANAGARI DIGIT NINE -->
<Key
latin:keyStyle="baseKeyDevanagariVowelSignO"
@@ -172,12 +136,9 @@
<Key
latin:keySpec="प"
latin:keyHintLabel="0"
- latin:additionalMoreKeys="०,0"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="०,0" />
<!-- U+0907: "इ" DEVANAGARI LETTER I -->
- <Key
- latin:keySpec="इ"
- latin:keyLabelFlags="fontNormal" />
- </default>
+ <Key latin:keySpec="इ" />
+ </default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_nepali_romanized2.xml b/java/res/xml/rowkeys_nepali_romanized2.xml
index 561ae6c932..2e2583ccab 100644
--- a/java/res/xml/rowkeys_nepali_romanized2.xml
+++ b/java/res/xml/rowkeys_nepali_romanized2.xml
@@ -18,109 +18,61 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0906: "आ" DEVANAGARI LETTER AA -->
- <Key
- latin:keySpec="आ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="आ" />
<!-- U+0936: "श" DEVANAGARI LETTER SHA -->
- <Key
- latin:keySpec="श"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="श" />
<!-- U+0927: "ध" DEVANAGARI LETTER DHA -->
- <Key
- latin:keySpec="ध"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ध" />
<!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
- <Key
- latin:keySpec="ऊ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ऊ" />
<!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
- <Key
- latin:keySpec="घ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="घ" />
<!-- U+0905: "अ" DEVANAGARI LETTER A -->
- <Key
- latin:keySpec="अ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="अ" />
<!-- U+091D: "à¤" DEVANAGARI LETTER JHA -->
- <Key
- latin:keySpec="झ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="झ" />
<!-- U+0916: "ख" DEVANAGARI LETTER KHA -->
- <Key
- latin:keySpec="ख"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ख" />
<!-- U+0965: "॥" DEVANAGARI DOUBLE DANDA -->
- <Key
- latin:keySpec="॥"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="॥" />
<!-- U+0910: "à¤" DEVANAGARI LETTER AI -->
- <Key
- latin:keySpec="ऐ"
- latin:keyLabelFlags="fontNormal" />
+ <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_visarga" />
- <Key
- latin:keyStyle="baseKeyDevanagariSignVisarga" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
+ <Key latin:keyStyle="baseKeyDevanagariSignVisarga" />
</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_aa" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignAa" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" />
<!-- U+0938: "स" DEVANAGARI LETTER SA -->
- <Key
- latin:keySpec="स"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="स" />
<!-- U+0926: "द" DEVANAGARI LETTER DA -->
- <Key
- latin:keySpec="द"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="द" />
<!-- U+0909: "उ" DEVANAGARI LETTER U -->
- <Key
- latin:keySpec="उ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="उ" />
<!-- U+0917: "ग" DEVANAGARI LETTER GA -->
- <Key
- latin:keySpec="ग"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ग" />
<!-- U+0939: "ह" DEVANAGARI LETTER HA -->
- <Key
- latin:keySpec="ह"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ह" />
<!-- U+091C: "ज" DEVANAGARI LETTER JA -->
- <Key
- latin:keySpec="ज"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ज" />
<!-- U+0915: "क" DEVANAGARI LETTER KA -->
- <Key
- latin:keySpec="क"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="क" />
<!-- U+0932: "ल" DEVANAGARI LETTER LA -->
- <Key
- latin:keySpec="ल"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ल" />
<!-- U+090F: "à¤" DEVANAGARI LETTER E -->
- <Key
- latin:keySpec="ए"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ए" />
<!-- U+0950: "à¥" DEVANAGARI OM -->
- <Key
- latin:keySpec="ॐ"
- latin:keyLabelFlags="fontNormal" />
- </default>
+ <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 cc2ca8c844..24f5908328 100644
--- a/java/res/xml/rowkeys_nepali_romanized3.xml
+++ b/java/res/xml/rowkeys_nepali_romanized3.xml
@@ -18,101 +18,62 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
- <Key
- latin:keySpec="ऋ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ऋ" />
<!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
- <Key
- latin:keySpec="ढ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ढ" />
<!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
- <Key
- latin:keySpec="छ"
- latin:keyLabelFlags="fontNormal" />
+ <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_candrabindu" />
- <Key
- latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+ <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
<!-- U+092D: "à¤" DEVANAGARI LETTER BHA -->
- <Key
- latin:keySpec="भ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="भ" />
<!-- U+0923: "ण" DEVANAGARI LETTER NNA -->
- <Key
- latin:keySpec="ण"
- latin:keyLabelFlags="fontNormal" />
+ <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_anusvara" />
- <Key
- latin:keyStyle="baseKeyDevanagariSignAnusvara" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
<!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
- <Key
- latin:keySpec="ङ"
- latin:keyLabelFlags="fontNormal" />
+ <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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+ <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
</case>
<default>
<!-- U+0937: "ष" DEVANAGARI LETTER SSA -->
- <Key
- latin:keySpec="ष"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ष" />
<!-- U+0921: "ड" DEVANAGARI LETTER DDA -->
- <Key
- latin:keySpec="ड"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ड" />
<!-- U+091A: "च" DEVANAGARI LETTER CA -->
- <Key
- latin:keySpec="च"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="च" />
<!-- U+0935: "व" DEVANAGARI LETTER VA -->
- <Key
- latin:keySpec="व"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="व" />
<!-- U+092C: "ब" DEVANAGARI LETTER BHA -->
- <Key
- latin:keySpec="ब"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ब" />
<!-- U+0928: "न" DEVANAGARI LETTER NA -->
- <Key
- latin:keySpec="न"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="न" />
<!-- U+092E: "म" DEVANAGARI LETTER MA -->
- <Key
- latin:keySpec="म"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="म" />
<!-- U+0964: "।" DEVANAGARI DANDA
U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
<Key
latin:keySpec="।"
- latin:moreKeys="ऽ"
- latin:keyLabelFlags="fontNormal" />
+ 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+ <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional1.xml b/java/res/xml/rowkeys_nepali_traditional1.xml
index cf4bda982e..73b2275ef3 100644
--- a/java/res/xml/rowkeys_nepali_traditional1.xml
+++ b/java/res/xml/rowkeys_nepali_traditional1.xml
@@ -18,13 +18,9 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0924/U+094D/U+0924: "तà¥à¤¤" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TA
U+091E: "ञ" DEVANAGARI LETTER NYA
U+091C/U+094D/U+091E: "जà¥à¤ž" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA
@@ -32,68 +28,62 @@
<Key
latin:keySpec="त्त"
latin:moreKeys="ञ,ज्ञ,॥"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0921/U+094D/U+0922: "डà¥à¤¢" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDHA
U+0908: "ई" DEVANAGARI LETTER II -->
<Key
latin:keySpec="ड्ढ"
latin:moreKeys="ई"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0910: "à¤" DEVANAGARI LETTER AI
U+0918: "घ" DEVANAGARI LETTER GHA -->
<Key
latin:keySpec="ऐ"
- latin:moreKeys="घ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="घ" />
<!-- U+0926/U+094D/U+0935: "दà¥à¤µ" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER VA
U+0926/U+094D/U+0927: "दà¥à¤§" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DHA -->
<Key
latin:keySpec="द्व"
latin:moreKeys="द्ध"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+091F/U+094D/U+091F: "टà¥à¤Ÿ" DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTA
U+091B: "छ" DEVANAGARI LETTER CHA -->
<Key
latin:keySpec="ट्ट"
latin:moreKeys="छ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0920/U+094D/U+0920: "ठà¥à¤ " DEVANAGARI LETTER TTHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA
U+091F: "ट" DEVANAGARI LETTER TTA -->
<Key
latin:keySpec="ठ्ठ"
latin:moreKeys="ट"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+090A: "ऊ" DEVANAGARI LETTER UU
U+0920: "ठ" DEVANAGARI LETTER TTHA -->
<Key
latin:keySpec="ऊ"
- latin:moreKeys="ठ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ठ" />
<!-- U+0915/U+094D/U+0937: "कà¥à¤·" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
U+0921: "ड" DEVANAGARI LETTER DDA -->
<Key
latin:keySpec="क्ष"
latin:moreKeys="ड"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0907: "इ" DEVANAGARI LETTER I
U+0922: "ढ" DEVANAGARI LETTER DDHA -->
<Key
latin:keySpec="इ"
- latin:moreKeys="ढ"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="ढ" />
<!-- U+090F: "à¤" DEVANAGARI LETTER E
U+0923: "ण" DEVANAGARI LETTER NNA -->
<Key
latin:keySpec="ए"
- latin:moreKeys="ण"
- latin:keyLabelFlags="fontNormal" />
+ 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_vowel_sign_vocalic_r" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignVocalicR" />
</case>
<default>
<!-- U+091F: "ट" DEVANAGARI LETTER TTA
@@ -101,77 +91,66 @@
<Key
latin:keySpec="ट"
latin:keyHintLabel="1"
- latin:additionalMoreKeys="१,1"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="१,1" />
<!-- U+0927: "ध" DEVANAGARI LETTER DHA
U+0968: "२" DEVANAGARI DIGIT TWO -->
<Key
latin:keySpec="ध"
latin:keyHintLabel="2"
- latin:additionalMoreKeys="२,2"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="२,2" />
<!-- U+092D: "à¤" DEVANAGARI LETTER BHA
U+0969: "३" DEVANAGARI DIGIT THREE -->
<Key
latin:keySpec="भ"
latin:keyHintLabel="3"
- latin:additionalMoreKeys="३,3"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="३,3" />
<!-- U+091A: "च" DEVANAGARI LETTER CA
U+096A: "४" DEVANAGARI DIGIT FOUR -->
<Key
latin:keySpec="च"
latin:keyHintLabel="4"
- latin:additionalMoreKeys="४,4"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="४,4" />
<!-- U+0924: "त" DEVANAGARI LETTER TA
U+096B: "५" DEVANAGARI DIGIT FIVE -->
<Key
latin:keySpec="त"
latin:keyHintLabel="5"
- latin:additionalMoreKeys="५,5"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="५,5" />
<!-- U+0925: "थ" DEVANAGARI LETTER THA
U+096C: "६" DEVANAGARI DIGIT SIX -->
<Key
latin:keySpec="थ"
latin:keyHintLabel="6"
- latin:additionalMoreKeys="६,6"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="६,6" />
<!-- U+0917: "ग" DEVANAGARI LETTER G
U+096D: "à¥" DEVANAGARI DIGIT SEVEN -->
<Key
latin:keySpec="ग"
latin:keyHintLabel="7"
- latin:additionalMoreKeys="७,7"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="७,7" />
<!-- U+0937: "ष" DEVANAGARI LETTER SSA
U+096E: "८" DEVANAGARI DIGIT EIGHT -->
<Key
latin:keySpec="ष"
latin:keyHintLabel="8"
- latin:additionalMoreKeys="८,8"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="८,8" />
<!-- U+092F: "य" DEVANAGARI LETTER YA
U+096F: "९" DEVANAGARI DIGIT NINE -->
<Key
latin:keySpec="य"
latin:keyHintLabel="9"
- latin:additionalMoreKeys="९,9"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="९,9" />
<!-- U+0909: "उ" DEVANAGARI LETTER U
U+0966: "०" DEVANAGARI DIGIT ZERO -->
<Key
latin:keySpec="उ"
latin:keyHintLabel="0"
- latin:additionalMoreKeys="०,0"
- latin:keyLabelFlags="fontNormal" />
+ latin:additionalMoreKeys="०,0" />
<!-- U+0907: "इ" DEVANAGARI LETTER I
U+0914: "औ" DEVANAGARI LETTER AU -->
<Key
latin:keySpec="इ"
- latin:moreKeys="औ"
- latin:keyLabelFlags="fontNormal" />
- </default>
+ latin:moreKeys="औ" />
+ </default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional2.xml b/java/res/xml/rowkeys_nepali_traditional2.xml
index 58a463e71b..c443daf5da 100644
--- a/java/res/xml/rowkeys_nepali_traditional2.xml
+++ b/java/res/xml/rowkeys_nepali_traditional2.xml
@@ -18,124 +18,84 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0906: "आ" DEVANAGARI LETTER AA -->
- <Key
- latin:keySpec="आ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="आ" />
<!-- U+0919/U+094D: "ङà¥" DEVANAGARI LETTER NGA/DEVANAGARI SIGN VIRAMA -->
<Key
latin:keySpec="ङ्"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0921/U+094D/U+0921: "डà¥à¤¡" DEVANAGARI LETTER DDA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DDA -->
<Key
latin:keySpec="ड्ड"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ 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. -->
- <include
- latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
- <Key
- latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_candrabindu" />
+ <Key latin:keyStyle="baseKeyDevanagariSignCandrabindu" />
<!-- U+0926/U+094D/U+0926: "दà¥à¤¦" DEVANAGARI LETTER DA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER DA -->
<Key
latin:keySpec="द्द"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+091D: "à¤" DEVANAGARI LETTER JHA -->
- <Key
- latin:keySpec="झ"
- latin:keyLabelFlags="fontNormal" />
+ <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_o" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignO" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
<!-- U+092B: "फ" DEVANAGARI LETTER PHA -->
- <Key
- latin:keySpec="फ"
- latin:keyLabelFlags="fontNormal" />
+ <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_ii" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignIi" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_ii" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignIi" />
<!-- U+091F/U+094D/U+0920: "टà¥à¤ " DEVANAGARI LETTER TTA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER TTHA -->
<Key
latin:keySpec="ट्ठ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ 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. -->
- <include
- latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignUu" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_uu" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignUu" />
</case>
<default>
<!-- U+092C: "ब" DEVANAGARI LETTER BA -->
- <Key
- latin:keySpec="ब"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ब" />
<!-- U+0915: "क" DEVANAGARI LETTER KA -->
- <Key
- latin:keySpec="क"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="क" />
<!-- U+092E: "म" DEVANAGARI LETTER MA -->
- <Key
- latin:keySpec="म"
- latin:keyLabelFlags="fontNormal" />
+ <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_aa" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignAa" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_aa" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignAa" />
<!-- U+0928: "न" DEVANAGARI LETTER NA -->
- <Key
- latin:keySpec="न"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="न" />
<!-- U+091C: "ज" DEVANAGARI LETTER JA -->
- <Key
- latin:keySpec="ज"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ज" />
<!-- U+0935: "व" DEVANAGARI LETTER VA -->
- <Key
- latin:keySpec="व"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="व" />
<!-- U+092A: "प" DEVANAGARI LETTER PA -->
- <Key
- latin:keySpec="प"
- latin:keyLabelFlags="fontNormal" />
+ <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_i" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignI" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
<!-- U+0938: "स" DEVANAGARI LETTER SA -->
- <Key
- latin:keySpec="स"
- latin:keyLabelFlags="fontNormal" />
+ <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_u" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignU" />
- </default>
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
+ </default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional3_left6.xml b/java/res/xml/rowkeys_nepali_traditional3_left6.xml
index 59f6e651aa..ade278710d 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_left6.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_left6.xml
@@ -18,66 +18,44 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0915/U+094D: "कà¥" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA -->
<Key
latin:keySpec="क्"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0939/U+094D/U+092E: "हà¥à¤®" DEVANAGARI LETTER HA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER MA -->
<Key
latin:keySpec="ह्म"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R -->
- <Key
- latin:keySpec="ऋ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ऋ" />
<!-- U+0950: "à¥" DEVANAGARI OM -->
- <Key
- latin:keySpec="ॐ"
- latin:keyLabelFlags="fontNormal" />
+ <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" />
+ <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="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
</case>
<default>
<!-- U+0936: "श" DEVANAGARI LETTER SHA -->
- <Key
- latin:keySpec="श"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="श" />
<!-- U+0939: "ह" DEVANAGARI LETTER HA -->
- <Key
- latin:keySpec="ह"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ह" />
<!-- U+0905: "अ" DEVANAGARI LETTER A -->
- <Key
- latin:keySpec="अ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="अ" />
<!-- U+0916: "ख" DEVANAGARI LETTER KHA -->
- <Key
- latin:keySpec="ख"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ख" />
<!-- U+0926: "द" DEVANAGARI LETTER DA -->
- <Key
- latin:keySpec="द"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="द" />
<!-- U+0932: "ल" DEVANAGARI LETTER LA -->
- <Key
- latin:keySpec="ल"
- latin:keyLabelFlags="fontNormal" />
+ <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
index 3e6187d110..4db438d81e 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_right3.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_right3.xml
@@ -18,50 +18,35 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
<!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
- <Key
- latin:keySpec="ङ"
- latin:keyLabelFlags="fontNormal" />
+ <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" />
+ <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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
<!-- U+0964: "।" DEVANAGARI DANDA -->
- <Key
- latin:keySpec="।"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="।" />
<!-- U+0930: "र" DEVANAGARI LETTER RA
U+0930/U+0941: "रà¥" DEVANAGARI LETTER RA/DEVANAGARI VOWEL SIGN U -->
<Key
latin:keySpec="र"
- latin:moreKeys="रु"
- latin:keyLabelFlags="fontNormal" />
- </default>
+ latin:moreKeys="रु" />
+ </default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_nepali_traditional3_right5.xml b/java/res/xml/rowkeys_nepali_traditional3_right5.xml
index 89d5aa4697..c7c73a4460 100644
--- a/java/res/xml/rowkeys_nepali_traditional3_right5.xml
+++ b/java/res/xml/rowkeys_nepali_traditional3_right5.xml
@@ -18,45 +18,35 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_anusvara" />
+ <Key latin:keyStyle="baseKeyDevanagariSignAnusvara" />
<!-- U+0919: "ङ" DEVANAGARI LETTER NGA -->
- <Key
- latin:keySpec="ङ"
- latin:keyLabelFlags="fontNormal" />
+ <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" />
+ <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="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<Key
- latin:keySpec="\?" />
+ 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_visarga" />
<!-- U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
<Key
latin:keyStyle="baseKeyDevanagariSignVisarga"
@@ -64,27 +54,20 @@
<!-- 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" />
+ <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
<!-- Override more keys with empty definition -->
- <key-style
- latin:styleName="moreKeysDevanagariVowelSignE" />
- <Key
- latin:keyStyle="baseKeyDevanagariVowelSignE" />
+ <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
+ <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
<!-- U+0964: "।" DEVANAGARI DANDA -->
- <Key
- latin:keySpec="।"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="।" />
<!-- U+0930: "र" DEVANAGARI LETTER RA -->
<Key
latin:keySpec="र"
- latin:moreKeys="!"
- latin:keyLabelFlags="fontNormal" />
+ 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"
latin:moreKeys="\?" />
diff --git a/java/res/xml/rowkeys_sinhala1.xml b/java/res/xml/rowkeys_sinhala1.xml
index e784d2d3af..fcad5eaa3c 100644
--- a/java/res/xml/rowkeys_sinhala1.xml
+++ b/java/res/xml/rowkeys_sinhala1.xml
@@ -18,43 +18,29 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0DD6: "à·–" SINHALA VOWEL SIGN DIGA PAA-PILLA -->
- <Key
- latin:keySpec="ූ" />
+ <Key latin:keySpec="ූ" />
<!-- U+0D8B: "උ" SINHALA LETTER UYANNA -->
- <Key
- latin:keySpec="උ" />
+ <Key latin:keySpec="උ" />
<!-- U+0DD1: "à·‘" SINHALA VOWEL SIGN DIGA AEDA-PILLA -->
- <Key
- latin:keySpec="ෑ" />
+ <Key latin:keySpec="ෑ" />
<!-- U+0D8D: "à¶" SINHALA LETTER IRUYANNA -->
- <Key
- latin:keySpec="ඍ" />
+ <Key latin:keySpec="ඍ" />
<!-- U+0D94: "ඔ" SINHALA LETTER OYANNA -->
- <Key
- latin:keySpec="ඔ" />
+ <Key latin:keySpec="ඔ" />
<!-- U+0DC1: "à·" SINHALA LETTER TAALUJA SAYANNA -->
- <Key
- latin:keySpec="ශ" />
+ <Key latin:keySpec="ශ" />
<!-- U+0DB9: "ඹ" SINHALA LETTER AMBA BAYANNA -->
- <Key
- latin:keySpec="ඹ" />
+ <Key latin:keySpec="ඹ" />
<!-- U+0DC2: "à·‚" SINHALA LETTER MUURDHAJA SAYANNA -->
- <Key
- latin:keySpec="ෂ" />
+ <Key latin:keySpec="ෂ" />
<!-- U+0DB0: "ධ" SINHALA LETTER MAHAAPRAANA DAYANNA -->
- <Key
- latin:keySpec="ධ" />
+ <Key latin:keySpec="ධ" />
<!-- U+0DA1: "ඡ" SINHALA LETTER MAHAAPRAANA CAYANNA -->
- <Key
- latin:keySpec="ඡ" />
+ <Key latin:keySpec="ඡ" />
<!-- U+0DA5: "ඥ" SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA
U+0DF4: "à·´" SINHALA PUNCTUATION KUNDDALIYA -->
<Key
@@ -120,6 +106,6 @@
<Key
latin:keySpec="ඤ"
latin:moreKeys="෴" />
- </default>
+ </default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_sinhala2.xml b/java/res/xml/rowkeys_sinhala2.xml
index 91c1928baf..92c1e08924 100644
--- a/java/res/xml/rowkeys_sinhala2.xml
+++ b/java/res/xml/rowkeys_sinhala2.xml
@@ -18,81 +18,55 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0DDF: "à·Ÿ" SINHALA VOWEL SIGN GAYANUKITTA -->
- <Key
- latin:keySpec="ෟ" />
+ <Key latin:keySpec="ෟ" />
<!-- U+0DD3: "à·“" SINHALA VOWEL SIGN DIGA IS-PILLA -->
- <Key
- latin:keySpec="ී" />
+ <Key latin:keySpec="ී" />
<!-- U+0DD8: "à·˜" SINHALA VOWEL SIGN GAETTA-PILLA -->
- <Key
- latin:keySpec="ෘ" />
+ <Key latin:keySpec="ෘ" />
<!-- U+0DC6: "à·†" SINHALA LETTER FAYANNA -->
- <Key
- latin:keySpec="ෆ" />
+ <Key latin:keySpec="ෆ" />
<!-- U+0DA8: "ඨ" SINHALA LETTER MAHAAPRAANA TTAYANNA -->
- <Key
- latin:keySpec="ඨ" />
+ <Key latin:keySpec="ඨ" />
<!-- U+0DCA/U+200D/U+0DBA: "à·Šâ€à¶º" SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER/SINHALA LETTER YAYANNA -->
- <Key
- latin:keySpec="්‍ය" />
+ <Key latin:keySpec="්‍ය" />
<!-- U+0DC5/U+0DD4: "à·…à·”" SINHALA LETTER MUURDHAJA LAYANNA/SINHALA VOWEL SIGN KETTI PAA-PILLA -->
- <Key
- latin:keySpec="ළු" />
+ <Key latin:keySpec="ළු" />
<!-- U+0DAB: "ණ" SINHALA LETTER MUURDHAJA NAYANNA -->
- <Key
- latin:keySpec="ණ" />
+ <Key latin:keySpec="ණ" />
<!-- U+0D9B: "ඛ" SINHALA LETTER MAHAAPRAANA KAYANNA -->
- <Key
- latin:keySpec="ඛ" />
+ <Key latin:keySpec="ඛ" />
<!-- U+0DAE: "ථ" SINHALA LETTER MAHAAPRAANA TAYANNA -->
- <Key
- latin:keySpec="ථ" />
+ <Key latin:keySpec="ථ" />
<!-- U+0DCA/U+200D/U+0DBB: "à·Šâ€à¶»" SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER/SINHALA LETTER RAYANNA -->
- <Key
- latin:keySpec="්‍ර" />
+ <Key latin:keySpec="්‍ර" />
</case>
<default>
<!-- U+0DCA: "à·Š" SINHALA SIGN AL-LAKUNA -->
- <Key
- latin:keySpec="්" />
+ <Key latin:keySpec="්" />
<!-- U+0DD2: "à·’" SINHALA VOWEL SIGN KETTI IS-PILLA -->
- <Key
- latin:keySpec="ි" />
+ <Key latin:keySpec="ි" />
<!-- U+0DCF: "à·" SINHALA VOWEL SIGN AELA-PILLA -->
- <Key
- latin:keySpec="ා" />
+ <Key latin:keySpec="ා" />
<!-- U+0DD9: "à·™" SINHALA VOWEL SIGN KOMBUVA -->
- <Key
- latin:keySpec="ෙ" />
+ <Key latin:keySpec="ෙ" />
<!-- U+0DA7: "ට" SINHALA LETTER ALPAPRAANA TTAYANNA -->
- <Key
- latin:keySpec="ට" />
+ <Key latin:keySpec="ට" />
<!-- U+0DBA: "ය" SINHALA LETTER YAYANNA -->
- <Key
- latin:keySpec="ය" />
+ <Key latin:keySpec="ය" />
<!-- U+0DC0: "à·€" SINHALA LETTER VAYANNA -->
- <Key
- latin:keySpec="ව" />
+ <Key latin:keySpec="ව" />
<!-- U+0DB1: "න" SINHALA LETTER DANTAJA NAYANNA -->
- <Key
- latin:keySpec="න" />
+ <Key latin:keySpec="න" />
<!-- U+0D9A: "ක" SINHALA LETTER ALPAPRAANA KAYANNA -->
- <Key
- latin:keySpec="ක" />
+ <Key latin:keySpec="ක" />
<!-- U+0DAD: "à¶" SINHALA LETTER ALPAPRAANA TAYANNA -->
- <Key
- latin:keySpec="ත" />
+ <Key latin:keySpec="ත" />
<!-- U+0D8F: "à¶" SINHALA LETTER ILUYANNA -->
- <Key
- latin:keySpec="ඏ" />
- </default>
+ <Key latin:keySpec="ඏ" />
+ </default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_sinhala3.xml b/java/res/xml/rowkeys_sinhala3.xml
index 64ba9f339b..8727875175 100644
--- a/java/res/xml/rowkeys_sinhala3.xml
+++ b/java/res/xml/rowkeys_sinhala3.xml
@@ -18,40 +18,27 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0D9E: "ඞ" SINHALA LETTER KANTAJA NAASIKYAYA -->
- <Key
- latin:keySpec="ඞ" />
+ <Key latin:keySpec="ඞ" />
<!-- U+0DA3: "ඣ" SINHALA LETTER MAHAAPRAANA JAYANNA -->
- <Key
- latin:keySpec="ඣ" />
+ <Key latin:keySpec="ඣ" />
<!-- U+0DAA: "ඪ" SINHALA LETTER MAHAAPRAANA DDAYANNA -->
- <Key
- latin:keySpec="ඪ" />
+ <Key latin:keySpec="ඪ" />
<!-- U+0D8A: "ඊ" SINHALA LETTER IIYANNA -->
- <Key
- latin:keySpec="ඊ" />
+ <Key latin:keySpec="ඊ" />
<!-- U+0DB7: "භ" SINHALA LETTER MAHAAPRAANA BAYANNA -->
- <Key
- latin:keySpec="භ" />
+ <Key latin:keySpec="භ" />
<!-- U+0DB5: "ඵ" SINHALA LETTER MAHAAPRAANA PAYANNA -->
- <Key
- latin:keySpec="ඵ" />
+ <Key latin:keySpec="ඵ" />
<!-- U+0DC5: "à·…" SINHALA LETTER MUURDHAJA LAYANNA -->
- <Key
- latin:keySpec="ළ" />
+ <Key latin:keySpec="ළ" />
<!-- U+0D9D: "à¶" SINHALA LETTER MAHAAPRAANA GAYANNA -->
- <Key
- latin:keySpec="ඝ" />
+ <Key latin:keySpec="ඝ" />
<!-- U+0DBB/U+0DCA/U+200D: "ර්â€" SINHALA LETTER RAYANNA/SINHALA SIGN AL-LAKUNA/ZERO WIDTH JOINER -->
- <Key
- latin:keySpec="ර්‍" />
+ <Key latin:keySpec="ර්‍" />
</case>
<default>
<!-- U+0D82: "ං" SINHALA SIGN ANUSVARAYA
@@ -70,25 +57,20 @@
latin:keySpec="ඩ"
latin:moreKeys="ඬ" />
<!-- U+0D89: "ඉ" SINHALA LETTER IYANNA -->
- <Key
- latin:keySpec="ඉ" />
+ <Key latin:keySpec="ඉ" />
<!-- U+0DB6: "බ" SINHALA LETTER ALPAPRAANA BAYANNA -->
- <Key
- latin:keySpec="බ" />
+ <Key latin:keySpec="බ" />
<!-- U+0DB4: "ප" SINHALA LETTER ALPAPRAANA PAYANNA -->
- <Key
- latin:keySpec="ප" />
+ <Key latin:keySpec="ප" />
<!-- U+0DBD: "ල" SINHALA LETTER DANTAJA LAYANNA -->
- <Key
- latin:keySpec="ල" />
+ <Key latin:keySpec="ල" />
<!-- U+0D9C: "ග" SINHALA LETTER ALPAPRAANA GAYANNA
U+0D9F: "ඟ" SINHALA LETTER SANYAKA GAYANNA -->
<Key
latin:keySpec="ග"
latin:moreKeys="ඟ" />
<!-- U+0DF3: "à·³" SINHALA VOWEL SIGN DIGA GAYANUKITTA -->
- <Key
- latin:keySpec="ෳ" />
- </default>
+ <Key latin:keySpec="ෳ" />
+ </default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_thai1.xml b/java/res/xml/rowkeys_thai1.xml
index e42bda391d..864bca8765 100644
--- a/java/res/xml/rowkeys_thai1.xml
+++ b/java/res/xml/rowkeys_thai1.xml
@@ -18,150 +18,120 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Key
- latin:keySpec="+" />
+ latin:keySpec="+"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+0E51: "๑" THAI DIGIT ONE -->
- <Key
- latin:keySpec="๑"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="๑" />
<!-- U+0E52: "๒" THAI DIGIT TWO -->
- <Key
- latin:keySpec="๒"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="๒" />
<!-- U+0E53: "๓" THAI DIGIT THREE -->
- <Key
- latin:keySpec="๓"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="๓" />
<!-- U+0E54: "๔" THAI DIGIT FOUR -->
- <Key
- latin:keySpec="๔"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="๔" />
<!-- U+0020: " " SPACE
U+0E39: " ู" THAI CHARACTER SARA UU -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ู|ู"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
- <Key
- latin:keySpec="฿"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="฿" />
<!-- U+0E55: "๕" THAI DIGIT FIVE -->
- <Key
- latin:keySpec="๕"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="๕" />
<!-- U+0E56: "๖" THAI DIGIT SIX -->
- <Key
- latin:keySpec="๖"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="๖" />
<!-- U+0E57: "๗" THAI DIGIT SEVEN -->
- <Key
- latin:keySpec="๗"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="๗" />
<!-- U+0E58: "๘" THAI DIGIT EIGHT -->
- <Key
- latin:keySpec="๘"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="๘" />
<!-- U+0E59: "๙" THAI DIGIT NINE -->
- <Key
- latin:keySpec="๙"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="๙" />
</case>
<default>
<!-- U+0E45: "ๅ" THAI CHARACTER LAKKHANGYAO -->
- <Key
- latin:keySpec="ๅ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ๅ" />
<!-- U+0E51: "๑" THAI DIGIT ONE -->
<Key
+ latin:keySpec="/"
latin:keyHintLabel="1"
latin:additionalMoreKeys="1"
latin:moreKeys="๑"
- latin:keySpec="/" />
+ latin:keyLabelFlags="fontDefault" />
<!-- U+0E52: "๒" THAI DIGIT TWO -->
<Key
+ latin:keySpec="_"
latin:keyHintLabel="2"
latin:additionalMoreKeys="2"
latin:moreKeys="๒"
- latin:keySpec="_" />
+ latin:keyLabelFlags="fontDefault" />
<!-- U+0E20: "ภ" THAI CHARACTER PHO SAMPHAO
U+0E53: "๓" THAI DIGIT THREE -->
<Key
latin:keySpec="ภ"
latin:keyHintLabel="3"
latin:additionalMoreKeys="3"
- latin:moreKeys="๓"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="๓" />
<!-- U+0E16: "ถ" THAI CHARACTER THO THUNG
U+0E54: "๔" THAI DIGIT FOUR -->
<Key
latin:keySpec="ถ"
latin:keyHintLabel="4"
latin:additionalMoreKeys="4"
- latin:moreKeys="๔"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="๔" />
<!-- U+0020: " " SPACE
U+0E38: " ุ" THAI CHARACTER SARA U -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ุ|ุ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E36: " ึ" THAI CHARACTER SARA UE -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ึ|ึ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0E04: "ค" THAI CHARACTER KHO KHWAI
U+0E55: "๕" THAI DIGIT FIVE -->
<Key
latin:keySpec="ค"
latin:keyHintLabel="5"
latin:additionalMoreKeys="5"
- latin:moreKeys="๕"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="๕" />
<!-- U+0E15: "ต" THAI CHARACTER TO TAO
U+0E56: "๖" THAI DIGIT SIX -->
<Key
latin:keySpec="ต"
latin:keyHintLabel="6"
latin:additionalMoreKeys="6"
- latin:moreKeys="๖"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="๖" />
<!-- U+0E08: "จ" THAI CHARACTER CHO CHAN
U+0E57: "๗" THAI DIGIT SEVEN -->
<Key
latin:keySpec="จ"
latin:keyHintLabel="7"
latin:additionalMoreKeys="7"
- latin:moreKeys="๗"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="๗" />
<!-- U+0E02: "ข" THAI CHARACTER KHO KHAI
U+0E58: "๘" THAI DIGIT EIGHT -->
<Key
latin:keySpec="ข"
latin:keyHintLabel="8"
latin:additionalMoreKeys="8"
- latin:moreKeys="๘"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="๘" />
<!-- U+0E0A: "ช" THAI CHARACTER CHO CHANG
U+0E59: "๙" THAI DIGIT NINE -->
<Key
latin:keySpec="ช"
latin:keyHintLabel="9"
latin:additionalMoreKeys="9"
- latin:moreKeys="๙"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="๙" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_thai2.xml b/java/res/xml/rowkeys_thai2.xml
index 7ab036a050..f43d31fffe 100644
--- a/java/res/xml/rowkeys_thai2.xml
+++ b/java/res/xml/rowkeys_thai2.xml
@@ -18,63 +18,45 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0E50: "à¹" THAI DIGIT ZERO -->
+ <Key latin:keySpec="๐" />
<Key
- latin:keySpec="๐"
- latin:keyLabelFlags="fontNormal" />
- <Key
- latin:keySpec=""" />
+ latin:keySpec="""
+ latin:keyLabelFlags="fontDefault" />
<!-- U+0E0E: "ฎ" THAI CHARACTER DO CHADA -->
- <Key
- latin:keySpec="ฎ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฎ" />
<!-- U+0E11: "ฑ" THAI CHARACTER THO NANGMONTHO -->
- <Key
- latin:keySpec="ฑ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฑ" />
<!-- U+0E18: "ธ" THAI CHARACTER THO THONG -->
- <Key
- latin:keySpec="ธ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ธ" />
<!-- U+0020: " " SPACE
U+0E4D: " à¹" THAI CHARACTER THANTHAKHAT -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ํ|ํ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E4A: " ๊" THAI CHARACTER MAI TRI -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ๊|๊"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0E13: "ณ" THAI CHARACTER NO NEN -->
- <Key
- latin:keySpec="ณ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ณ" />
<!-- U+0E2F: "ฯ" THAI CHARACTER PAIYANNOI -->
- <Key
- latin:keySpec="ฯ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฯ" />
<!-- U+0E0D: "à¸" THAI CHARACTER YO YING -->
- <Key
- latin:keySpec="ญ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ญ" />
<!-- U+0E10: "à¸" THAI CHARACTER THO THAN -->
+ <Key latin:keySpec="ฐ" />
<Key
- latin:keySpec="ฐ"
- latin:keyLabelFlags="fontNormal" />
- <Key
- latin:keySpec="," />
+ latin:keySpec=","
+ latin:keyLabelFlags="fontDefault" />
</case>
<default>
<!-- U+0E46: "ๆ" THAI CHARACTER MAIYAMOK
@@ -83,58 +65,39 @@
latin:keySpec="ๆ"
latin:keyHintLabel="0"
latin:additionalMoreKeys="0"
- latin:moreKeys="๐"
- latin:keyLabelFlags="fontNormal" />
+ latin:moreKeys="๐" />
<!-- U+0E44: "ไ" THAI CHARACTER SARA AI MAIMALAI -->
- <Key
- latin:keySpec="ไ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ไ" />
<!-- U+0E33: "ำ" THAI CHARACTER SARA AM -->
- <Key
- latin:keySpec="ำ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ำ" />
<!-- U+0E1E: "พ" THAI CHARACTER PHO PHAN -->
- <Key
- latin:keySpec="พ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="พ" />
<!-- U+0E30: "ะ" THAI CHARACTER SARA A -->
- <Key
- latin:keySpec="ะ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ะ" />
<!-- U+0020: " " SPACE
U+0E31: " ั" THAI CHARACTER MAI HAN-AKAT -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ั|ั"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E35: " ี" HAI CHARACTER SARA II -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ี|ี"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0E23: "ร" THAI CHARACTER RO RUA -->
- <Key
- latin:keySpec="ร"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ร" />
<!-- U+0E19: "น" THAI CHARACTER NO NU -->
- <Key
- latin:keySpec="น"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="น" />
<!-- U+0E22: "ย" THAI CHARACTER YO YAK -->
- <Key
- latin:keySpec="ย"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ย" />
<!-- U+0E1A: "บ" THAI CHARACTER BO BAIMAI -->
- <Key
- latin:keySpec="บ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="บ" />
<!-- U+0E25: "ล" THAI CHARACTER LO LING -->
- <Key
- latin:keySpec="ล"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ล" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_thai3.xml b/java/res/xml/rowkeys_thai3.xml
index 098d8a780d..03959b9aaa 100644
--- a/java/res/xml/rowkeys_thai3.xml
+++ b/java/res/xml/rowkeys_thai3.xml
@@ -18,113 +18,76 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<!-- U+0E24: "ฤ" THAI CHARACTER RU -->
- <Key
- latin:keySpec="ฤ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฤ" />
<!-- U+0E06: "ฆ" THAI CHARACTER KHO RAKHANG -->
- <Key
- latin:keySpec="ฆ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฆ" />
<!-- U+0E0F: "à¸" THAI CHARACTER TO PATAK -->
- <Key
- latin:keySpec="ฏ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฏ" />
<!-- U+0E42: "โ" THAI CHARACTER SARA O -->
- <Key
- latin:keySpec="โ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="โ" />
<!-- U+0E0C: "ฌ" THAI CHARACTER CHO CHOE -->
- <Key
- latin:keySpec="ฌ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฌ" />
<!-- U+0020: " " SPACE
U+0E47: " ็" THAI CHARACTER MAITAIKHU -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ็|็"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E4B: " ๋" THAI CHARACTER MAI CHATTAWA -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ๋|๋"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0E29: "ษ" THAI CHARACTER SO RUSI -->
- <Key
- latin:keySpec="ษ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ษ" />
<!-- U+0E28: "ศ" THAI CHARACTER SO SALA -->
- <Key
- latin:keySpec="ศ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ศ" />
<!-- U+0E0B: "ซ" THAI CHARACTER SO SO -->
+ <Key latin:keySpec="ซ" />
<Key
- latin:keySpec="ซ"
- latin:keyLabelFlags="fontNormal" />
- <Key
- latin:keySpec="." />
+ latin:keySpec="."
+ latin:keyLabelFlags="fontDefault" />
</case>
<default>
<!-- U+0E1F: "ฟ" THAI CHARACTER FO FAN -->
- <Key
- latin:keySpec="ฟ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฟ" />
<!-- U+0E2B: "ห" THAI CHARACTER HO HIP -->
- <Key
- latin:keySpec="ห"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ห" />
<!-- U+0E01: "à¸" THAI CHARACTER KO KAI -->
- <Key
- latin:keySpec="ก"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ก" />
<!-- U+0E14: "ด" THAI CHARACTER DO DEK -->
- <Key
- latin:keySpec="ด"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ด" />
<!-- U+0E40: "เ" THAI CHARACTER SARA E -->
- <Key
- latin:keySpec="เ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="เ" />
<!-- U+0020: " " SPACE
U+0E49: " ้" THAI CHARACTER MAI THO -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ้|้"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E48: " ่" THAI CHARACTER MAI EK -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ่|่"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0E32: "า" THAI CHARACTER SARA AA -->
- <Key
- latin:keySpec="า"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="า" />
<!-- U+0E2A: "ส" THAI CHARACTER SO SUA -->
- <Key
- latin:keySpec="ส"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ส" />
<!-- U+0E27: "ว" THAI CHARACTER WO WAEN -->
- <Key
- latin:keySpec="ว"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ว" />
<!-- U+0E07: "ง" THAI CHARACTER NGO NGU -->
- <Key
- latin:keySpec="ง"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ง" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rowkeys_thai4.xml b/java/res/xml/rowkeys_thai4.xml
index 332d09d7e4..db665bed55 100644
--- a/java/res/xml/rowkeys_thai4.xml
+++ b/java/res/xml/rowkeys_thai4.xml
@@ -18,101 +18,74 @@
*/
-->
-<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:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
- >
+ <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
<Key
- latin:keySpec="(" />
+ latin:keySpec="("
+ latin:keyLabelFlags="fontDefault" />
<Key
- latin:keySpec=")" />
+ latin:keySpec=")"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+0E09: "ฉ" THAI CHARACTER CHO CHING -->
- <Key
- latin:keySpec="ฉ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฉ" />
<!-- U+0E2E: "ฮ" THAI CHARACTER HO NOKHUK -->
- <Key
- latin:keySpec="ฮ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฮ" />
<!-- U+0020: " " SPACE
U+0E3A: " ฺ" THAI CHARACTER PHINTHU -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ฺ|ฺ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E4C: " ์" THAI CHARACTER THANTHAKHAT -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ์|์"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<Key
- latin:keySpec="\?" />
+ latin:keySpec="\?"
+ latin:keyLabelFlags="fontDefault" />
<!-- U+0E12: "ฒ" THAI CHARACTER THO PHUTHAO -->
- <Key
- latin:keySpec="ฒ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฒ" />
<!-- U+0E2C: "ฬ" THAI CHARACTER LO CHULA -->
- <Key
- latin:keySpec="ฬ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฬ" />
<!-- U+0E26: "ฦ" THAI CHARACTER LU -->
- <Key
- latin:keySpec="ฦ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฦ" />
</case>
<default>
<!-- U+0E1C: "ผ" THAI CHARACTER PHO PHUNG -->
- <Key
- latin:keySpec="ผ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ผ" />
<!-- U+0E1B: "ป" THAI CHARACTER PO PLA -->
- <Key
- latin:keySpec="ป"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ป" />
<!-- U+0E41: "à¹" THAI CHARACTER SARA AE -->
- <Key
- latin:keySpec="แ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="แ" />
<!-- U+0E2D: "à¸" THAI CHARACTER O ANG -->
- <Key
- latin:keySpec="อ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="อ" />
<!-- U+0020: " " SPACE
U+0E34: " ิ" THAI CHARACTER SARA I -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ิ|ิ"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0020: " " SPACE
U+0E37: " ื" THAI CHARACTER SARA UEE -->
<!-- Note: The space character is needed as a preceding letter to draw some Thai
composing characters correctly. -->
<Key
latin:keySpec=" ื|ื"
- latin:keyLabelFlags="fontNormal|followKeyLetterRatio" />
+ latin:keyLabelFlags="followKeyLetterRatio" />
<!-- U+0E17: "ท" THAI CHARACTER THO THAHAN -->
- <Key
- latin:keySpec="ท"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ท" />
<!-- U+0E21: "ม" THAI CHARACTER MO MA -->
- <Key
- latin:keySpec="ม"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ม" />
<!-- U+0E43: "ใ" THAI CHARACTER SARA AI MAIMUAN -->
- <Key
- latin:keySpec="ใ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ใ" />
<!-- U+0E1D: "à¸" THAI CHARACTER FO FA -->
- <Key
- latin:keySpec="ฝ"
- latin:keyLabelFlags="fontNormal" />
+ <Key latin:keySpec="ฝ" />
</default>
</switch>
</merge>
diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml
index 798c23e81b..3f765f3476 100644
--- a/java/res/xml/rows_arabic.xml
+++ b/java/res/xml/rows_arabic.xml
@@ -18,32 +18,28 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<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"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_arabic1" />
+ <include latin:keyboardLayout="@xml/rowkeys_arabic1" />
</Row>
<Row
latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_arabic2" />
+ <include latin:keyboardLayout="@xml/rowkeys_arabic2" />
</Row>
<Row
latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_arabic3" />
+ <include latin:keyboardLayout="@xml/rowkeys_arabic3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_armenian_phonetic.xml b/java/res/xml/rows_armenian_phonetic.xml
index ea8870e1ae..198436ca1e 100644
--- a/java/res/xml/rows_armenian_phonetic.xml
+++ b/java/res/xml/rows_armenian_phonetic.xml
@@ -18,47 +18,40 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
- <include
- latin:keyboardLayout="@xml/key_styles_currency" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
+ <include latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="10.0%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
+ <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic1" />
</Row>
<Row
latin:keyWidth="10.0%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
+ <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic2" />
</Row>
<Row
latin:keyWidth="10.0%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
- <include
- latin:keyboardLayout="@xml/key_armenian_xeh" />
+ <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic3" />
+ <include latin:keyboardLayout="@xml/key_armenian_xeh" />
</Row>
<Row
latin:keyWidth="9.8000%p"
+ latin:keyLabelFlags="fontNormal"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.8%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
- <include
- latin:keyboardLayout="@xml/key_armenian_sha" />
+ <include latin:keyboardLayout="@xml/rowkeys_armenian_phonetic4" />
+ <include latin:keyboardLayout="@xml/key_armenian_sha" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_bengali.xml b/java/res/xml/rows_bengali.xml
index 890f9352f8..4e4223b032 100644
--- a/java/res/xml/rows_bengali.xml
+++ b/java/res/xml/rows_bengali.xml
@@ -18,32 +18,28 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<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"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_bengali1" />
+ <include latin:keyboardLayout="@xml/rowkeys_bengali1" />
</Row>
<Row
- latin:keyWidth="9.091%p"
+ latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_bengali2" />
+ <include latin:keyboardLayout="@xml/rowkeys_bengali2" />
</Row>
<Row
latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_bengali3" />
+ <include latin:keyboardLayout="@xml/rowkeys_bengali3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_farsi.xml b/java/res/xml/rows_farsi.xml
index c74614fcf3..b78048c9d7 100644
--- a/java/res/xml/rows_farsi.xml
+++ b/java/res/xml/rows_farsi.xml
@@ -18,32 +18,28 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<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"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_farsi1" />
+ <include latin:keyboardLayout="@xml/rowkeys_farsi1" />
</Row>
<Row
latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_farsi2" />
+ <include latin:keyboardLayout="@xml/rowkeys_farsi2" />
</Row>
<Row
latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_farsi3" />
+ <include latin:keyboardLayout="@xml/rowkeys_farsi3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_hindi.xml b/java/res/xml/rows_hindi.xml
index 5c631ebff4..da869b144a 100644
--- a/java/res/xml/rows_hindi.xml
+++ b/java/res/xml/rows_hindi.xml
@@ -18,35 +18,31 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<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"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi1" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi1" />
</Row>
<Row
- latin:keyWidth="9.091%p"
+ latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi2" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi2" />
</Row>
<Row
latin:keyWidth="8.711%p"
+ latin:keyLabelFlags="fontNormal"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.8%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi3" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_hindi_compact.xml b/java/res/xml/rows_hindi_compact.xml
index a60cf2b02f..d21fada1c3 100644
--- a/java/res/xml/rows_hindi_compact.xml
+++ b/java/res/xml/rows_hindi_compact.xml
@@ -18,32 +18,28 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<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"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi_compact1" />
</Row>
<Row
- latin:keyWidth="9.091%p"
+ latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi_compact2" />
</Row>
<Row
latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
+ <include latin:keyboardLayout="@xml/rowkeys_hindi_compact3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_khmer.xml b/java/res/xml/rows_khmer.xml
index e3993871b8..69334f33e6 100644
--- a/java/res/xml/rows_khmer.xml
+++ b/java/res/xml/rows_khmer.xml
@@ -18,39 +18,33 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_khmer1" />
+ <include latin:keyboardLayout="@xml/rowkeys_khmer1" />
</Row>
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_khmer2" />
+ <include latin:keyboardLayout="@xml/rowkeys_khmer2" />
</Row>
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_khmer3" />
+ <include latin:keyboardLayout="@xml/rowkeys_khmer3" />
</Row>
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <Key
- latin:keyStyle="shiftKeyStyle" />
- <include
- latin:keyboardLayout="@xml/rowkeys_khmer4" />
- <Key
- latin:keyStyle="deleteKeyStyle" />
+ <Key latin:keyStyle="shiftKeyStyle" />
+ <include latin:keyboardLayout="@xml/rowkeys_khmer4" />
+ <Key latin:keyStyle="deleteKeyStyle" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_lao.xml b/java/res/xml/rows_lao.xml
index 321f4112ad..b3fbf56c58 100644
--- a/java/res/xml/rows_lao.xml
+++ b/java/res/xml/rows_lao.xml
@@ -18,39 +18,33 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_lao1" />
+ <include latin:keyboardLayout="@xml/rowkeys_lao1" />
</Row>
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_lao2" />
+ <include latin:keyboardLayout="@xml/rowkeys_lao2" />
</Row>
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_lao3" />
+ <include latin:keyboardLayout="@xml/rowkeys_lao3" />
</Row>
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal"
>
- <Key
- latin:keyStyle="shiftKeyStyle" />
- <include
- latin:keyboardLayout="@xml/rowkeys_lao4" />
- <Key
- latin:keyStyle="deleteKeyStyle" />
+ <Key latin:keyStyle="shiftKeyStyle" />
+ <include latin:keyboardLayout="@xml/rowkeys_lao4" />
+ <Key latin:keyStyle="deleteKeyStyle" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_marathi.xml b/java/res/xml/rows_marathi.xml
index 42a036374e..ff11adb758 100644
--- a/java/res/xml/rows_marathi.xml
+++ b/java/res/xml/rows_marathi.xml
@@ -18,32 +18,28 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<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"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_marathi1" />
+ <include latin:keyboardLayout="@xml/rowkeys_marathi1" />
</Row>
<Row
- latin:keyWidth="9.091%p"
+ latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_marathi2" />
+ <include latin:keyboardLayout="@xml/rowkeys_marathi2" />
</Row>
<Row
latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_marathi3" />
+ <include latin:keyboardLayout="@xml/rowkeys_marathi3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_myanmar.xml b/java/res/xml/rows_myanmar.xml
index 5de47f7b82..54538a9b96 100644
--- a/java/res/xml/rows_myanmar.xml
+++ b/java/res/xml/rows_myanmar.xml
@@ -18,39 +18,33 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<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" />
+ <include latin:keyboardLayout="@xml/rowkeys_myanmar1" />
</Row>
<Row
latin:keyWidth="10.0%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_myanmar2" />
+ <include latin:keyboardLayout="@xml/rowkeys_myanmar2" />
</Row>
<Row
latin:keyWidth="10.0%p"
+ latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_myanmar3" />
+ <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" />
+ <Key latin:keyStyle="shiftKeyStyle" />
+ <include latin:keyboardLayout="@xml/rowkeys_myanmar4" />
+ <Key latin:keyStyle="deleteKeyStyle" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
-</merge>
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
+</merge>
\ No newline at end of file
diff --git a/java/res/xml/rows_nepali_romanized.xml b/java/res/xml/rows_nepali_romanized.xml
index 6df09c830d..daca3ee86f 100644
--- a/java/res/xml/rows_nepali_romanized.xml
+++ b/java/res/xml/rows_nepali_romanized.xml
@@ -18,35 +18,31 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<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"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized1" />
</Row>
<Row
- latin:keyWidth="9.091%p"
+ latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized2" />
</Row>
<Row
latin:keyWidth="8.711%p"
+ latin:keyLabelFlags="fontNormal"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.8%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <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 7789135ae7..edcc73a20a 100644
--- a/java/res/xml/rows_nepali_traditional.xml
+++ b/java/res/xml/rows_nepali_traditional.xml
@@ -18,39 +18,33 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
- <include
- latin:keyboardLayout="@xml/key_styles_currency" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
+ <include latin:keyboardLayout="@xml/key_styles_currency" />
<Row
latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional1" />
</Row>
<Row
- latin:keyWidth="9.091%p"
+ latin:keyWidth="9.091%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional2" />
</Row>
<Row
latin:keyWidth="8.711%p"
+ latin:keyLabelFlags="fontNormal"
>
<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_left6" />
+ <include latin:keyboardLayout="@xml/rowkeys_nepali_traditional3_right3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_sinhala.xml b/java/res/xml/rows_sinhala.xml
index 5a058c96ea..a2ba0bb8b1 100644
--- a/java/res/xml/rows_sinhala.xml
+++ b/java/res/xml/rows_sinhala.xml
@@ -18,24 +18,19 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<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"
latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_sinhala1" />
+ <include latin:keyboardLayout="@xml/rowkeys_sinhala1" />
</Row>
<Row
latin:keyWidth="9.091%p"
latin:keyLabelFlags="fontNormal|autoXScale"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_sinhala2" />
+ <include latin:keyboardLayout="@xml/rowkeys_sinhala2" />
</Row>
<Row
latin:keyWidth="8.711%p"
@@ -44,12 +39,10 @@
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.8%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_sinhala3" />
+ <include latin:keyboardLayout="@xml/rowkeys_sinhala3" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
diff --git a/java/res/xml/rows_thai.xml b/java/res/xml/rows_thai.xml
index 108b7e1fc9..fffdb4415c 100644
--- a/java/res/xml/rows_thai.xml
+++ b/java/res/xml/rows_thai.xml
@@ -18,41 +18,34 @@
*/
-->
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
+ <include latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_thai1" />
+ <include latin:keyboardLayout="@xml/rowkeys_thai1" />
</Row>
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_thai2" />
+ <include latin:keyboardLayout="@xml/rowkeys_thai2" />
</Row>
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_thai3" />
- <include
- latin:keyboardLayout="@xml/key_thai_kho_khuat" />
+ <include latin:keyboardLayout="@xml/rowkeys_thai3" />
+ <include latin:keyboardLayout="@xml/key_thai_kho_khuat" />
</Row>
<Row
latin:keyWidth="8.3333%p"
+ latin:keyLabelFlags="fontNormal"
>
- <Key
- latin:keyStyle="shiftKeyStyle" />
- <include
- latin:keyboardLayout="@xml/rowkeys_thai4" />
- <Key
- latin:keyStyle="deleteKeyStyle" />
+ <Key latin:keyStyle="shiftKeyStyle" />
+ <include latin:keyboardLayout="@xml/rowkeys_thai4" />
+ <Key latin:keyStyle="deleteKeyStyle" />
</Row>
- <include
- latin:keyboardLayout="@xml/row_qwerty4" />
+ <include latin:keyboardLayout="@xml/row_qwerty4" />
</merge>
--
GitLab