From 449749ca9c3a8d532c7f88fc9ebd83e4b36d18e0 Mon Sep 17 00:00:00 2001
From: dslul <danielelaudani@protonmail.com>
Date: Thu, 10 Sep 2020 16:01:04 +0200
Subject: [PATCH] cleanup

---
 .../inputmethod/keyboard/KeyboardTheme.java   |  4 +-
 .../keyboard/emoji/EmojiPalettesView.java     |  9 +--
 .../main/res/layout/emoji_palettes_view.xml   | 19 ++----
 app/src/main/res/values-v17/setup-styles.xml  | 25 --------
 app/src/main/res/values/setup-styles.xml      | 41 ++++++------
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/xml-hu-rZZ/kbd_qwerty.xml    | 26 --------
 .../keystyle_devanagari_sign_anusvara.xml     | 51 ---------------
 .../keystyle_devanagari_sign_candrabindu.xml  | 42 -------------
 .../keystyle_devanagari_sign_nukta.xml        | 50 ---------------
 .../keystyle_devanagari_sign_virama.xml       | 53 ----------------
 .../keystyle_devanagari_sign_visarga.xml      | 30 ---------
 .../keystyle_devanagari_vowel_sign_aa.xml     | 55 ----------------
 .../keystyle_devanagari_vowel_sign_ai.xml     | 60 ------------------
 .../keystyle_devanagari_vowel_sign_au.xml     | 54 ----------------
 ...eystyle_devanagari_vowel_sign_candra_e.xml | 48 --------------
 ...eystyle_devanagari_vowel_sign_candra_o.xml | 48 --------------
 .../keystyle_devanagari_vowel_sign_e.xml      | 61 ------------------
 .../keystyle_devanagari_vowel_sign_i.xml      | 54 ----------------
 .../keystyle_devanagari_vowel_sign_ii.xml     | 54 ----------------
 .../keystyle_devanagari_vowel_sign_o.xml      | 56 -----------------
 .../keystyle_devanagari_vowel_sign_u.xml      | 55 ----------------
 .../keystyle_devanagari_vowel_sign_uu.xml     | 55 ----------------
 ...ystyle_devanagari_vowel_sign_vocalic_r.xml | 63 -------------------
 .../xml/keystyle_devanagari_sign_anusvara.xml | 16 ++---
 .../keystyle_devanagari_sign_candrabindu.xml  | 11 ++--
 .../xml/keystyle_devanagari_sign_nukta.xml    | 16 ++---
 .../xml/keystyle_devanagari_sign_virama.xml   | 16 ++---
 .../xml/keystyle_devanagari_sign_visarga.xml  |  6 +-
 .../xml/keystyle_devanagari_vowel_sign_aa.xml | 16 ++---
 .../xml/keystyle_devanagari_vowel_sign_ai.xml | 16 ++---
 .../xml/keystyle_devanagari_vowel_sign_au.xml | 13 ++--
 ...eystyle_devanagari_vowel_sign_candra_e.xml | 11 ++--
 ...eystyle_devanagari_vowel_sign_candra_o.xml | 11 ++--
 .../xml/keystyle_devanagari_vowel_sign_e.xml  | 21 +++----
 .../xml/keystyle_devanagari_vowel_sign_i.xml  | 16 ++---
 .../xml/keystyle_devanagari_vowel_sign_ii.xml | 16 ++---
 .../xml/keystyle_devanagari_vowel_sign_o.xml  | 16 ++---
 .../xml/keystyle_devanagari_vowel_sign_u.xml  | 16 ++---
 .../xml/keystyle_devanagari_vowel_sign_uu.xml | 16 ++---
 ...ystyle_devanagari_vowel_sign_vocalic_r.xml | 17 ++---
 41 files changed, 122 insertions(+), 1143 deletions(-)
 delete mode 100644 app/src/main/res/values-v17/setup-styles.xml
 delete mode 100644 app/src/main/res/xml-hu-rZZ/kbd_qwerty.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_sign_nukta.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_sign_virama.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_sign_visarga.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
 delete mode 100644 app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml

diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java
index 722492954..1507c2a69 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardTheme.java
@@ -62,10 +62,10 @@ public final class KeyboardTheme implements Comparable<KeyboardTheme> {
                 VERSION_CODES.BASE),
         new KeyboardTheme(THEME_ID_LIGHT_BORDER, "LXXLightBorder", R.style.KeyboardTheme_LXX_Light_Border,
                 // This has never been selected as default theme.
-                Build.VERSION_CODES.LOLLIPOP),
+                Build.VERSION_CODES.BASE),
         new KeyboardTheme(THEME_ID_DARK_BORDER, "LXXDarkBorder", R.style.KeyboardTheme_LXX_Dark_Border,
                 // This has never been selected as default theme.
-                VERSION_CODES.BASE),
+                VERSION_CODES.LOLLIPOP),
     };
 
     static {
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/emoji/EmojiPalettesView.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/emoji/EmojiPalettesView.java
index 82d93b867..581d17992 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/emoji/EmojiPalettesView.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/emoji/EmojiPalettesView.java
@@ -79,7 +79,6 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
 
     private ImageButton mDeleteKey;
     private TextView mAlphabetKeyLeft;
-    private TextView mAlphabetKeyRight;
     private View mSpacebar;
     // TODO: Remove this workaround.
     private View mSpacebarIcon;
@@ -206,7 +205,7 @@ protected void onFinishInflate() {
         mDeleteKey.setTag(Constants.CODE_DELETE);
         mDeleteKey.setOnTouchListener(mDeleteKeyOnTouchListener);
 
-        // {@link #mAlphabetKeyLeft}, {@link #mAlphabetKeyRight, and spaceKey depend on
+        // {@link #mAlphabetKeyLeft} and spaceKey depend on
         // {@link View.OnClickListener} as well as {@link View.OnTouchListener}.
         // {@link View.OnTouchListener} is used as the trigger of key-press, while
         // {@link View.OnClickListener} is used as the trigger of key-release which does not occur
@@ -218,11 +217,6 @@ protected void onFinishInflate() {
         mAlphabetKeyLeft.setTag(Constants.CODE_ALPHA_FROM_EMOJI);
         mAlphabetKeyLeft.setOnTouchListener(this);
         mAlphabetKeyLeft.setOnClickListener(this);
-        mAlphabetKeyRight = findViewById(R.id.emoji_keyboard_alphabet_right);
-        mAlphabetKeyRight.setBackgroundResource(mFunctionalKeyBackgroundId);
-        mAlphabetKeyRight.setTag(Constants.CODE_ALPHA_FROM_EMOJI);
-        mAlphabetKeyRight.setOnTouchListener(this);
-        mAlphabetKeyRight.setOnClickListener(this);
         mSpacebar = findViewById(R.id.emoji_keyboard_space);
         mSpacebar.setBackgroundResource(mSpacebarBackgroundId);
         mSpacebar.setTag(Constants.CODE_SPACE);
@@ -387,7 +381,6 @@ public void startEmojiPalettes(final String switchToAlphaLabel,
         final KeyDrawParams params = new KeyDrawParams();
         params.updateParams(mEmojiLayoutParams.getActionBarHeight(), keyVisualAttr);
         setupAlphabetKey(mAlphabetKeyLeft, switchToAlphaLabel, params);
-        setupAlphabetKey(mAlphabetKeyRight, switchToAlphaLabel, params);
         mEmojiPager.setAdapter(mEmojiPalettesAdapter);
         mEmojiPager.setCurrentItem(mCurrentPagerPosition);
     }
diff --git a/app/src/main/res/layout/emoji_palettes_view.xml b/app/src/main/res/layout/emoji_palettes_view.xml
index 11bdcf9d8..4afba898c 100644
--- a/app/src/main/res/layout/emoji_palettes_view.xml
+++ b/app/src/main/res/layout/emoji_palettes_view.xml
@@ -58,18 +58,6 @@
                     android:visibility="gone" />
             </FrameLayout>
         </TabHost>
-        <include layout="@layout/suggestion_divider" />
-        <!-- TODO: Implement KeyView and replace this. -->
-        <!-- Provide audio and haptic feedback by ourselves based on the keyboard settings.
-             We just need to ignore the system's audio and haptic feedback settings. -->
-        <ImageButton
-            android:id="@+id/emoji_keyboard_delete"
-            android:layout_width="0dip"
-            android:layout_weight="12.5"
-            android:layout_height="match_parent"
-            android:hapticFeedbackEnabled="false"
-            android:soundEffectsEnabled="false"
-            android:contentDescription="@string/spoken_description_delete" />
     </LinearLayout>
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/emoji_keyboard_pager"
@@ -120,13 +108,14 @@
         <!-- TODO: Implement KeyView and replace this. -->
         <!-- Provide audio and haptic feedback by ourselves based on the keyboard settings.
              We just need to ignore the system's audio and haptic feedback settings. -->
-        <TextView
-            android:id="@+id/emoji_keyboard_alphabet_right"
+        <ImageButton
+            android:id="@+id/emoji_keyboard_delete"
             android:layout_width="0dip"
             android:layout_weight="0.15"
             android:gravity="center"
             android:layout_height="match_parent"
             android:hapticFeedbackEnabled="false"
-            android:soundEffectsEnabled="false" />
+            android:soundEffectsEnabled="false"
+            android:contentDescription="@string/spoken_description_delete" />
     </LinearLayout>
 </org.dslul.openboard.inputmethod.keyboard.emoji.EmojiPalettesView>
diff --git a/app/src/main/res/values-v17/setup-styles.xml b/app/src/main/res/values-v17/setup-styles.xml
deleted file mode 100644
index 8a9d66477..000000000
--- a/app/src/main/res/values-v17/setup-styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="setupTitleStyle" parent="setupTitleStyleCommon">
-        <item name="android:layout_alignParentStart">true</item>
-    </style>
-    <style name="setupStepActionLabelStyle" parent="setupStepActionLabelStyleCommon">
-        <item name="android:paddingStart">12dp</item>
-        <item name="android:paddingEnd">24dp</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values/setup-styles.xml b/app/src/main/res/values/setup-styles.xml
index 2d54f2a88..8a9d66477 100644
--- a/app/src/main/res/values/setup-styles.xml
+++ b/app/src/main/res/values/setup-styles.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
 -->
 
-<resources>
-    <style name="setupTitleStyle" parent="setupTitleStyleCommon" />
-    <style name="setupStepActionLabelStyle" parent="setupStepActionLabelStyleCommon" />
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="setupTitleStyle" parent="setupTitleStyleCommon">
+        <item name="android:layout_alignParentStart">true</item>
+    </style>
+    <style name="setupStepActionLabelStyle" parent="setupStepActionLabelStyleCommon">
+        <item name="android:paddingStart">12dp</item>
+        <item name="android:paddingEnd">24dp</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b1312ee3..f55d00973 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -370,7 +370,7 @@ mobile devices. [CHAR LIMIT=25] -->
     <!-- The keyboard theme name, Holo Blue. This is marked as translatable="false" because this is a proper name of system-wide UI Theme.  -->
     <string name="keyboard_theme_holo_blue" translatable="false">Holo Blue</string>
     <!-- The keyboard theme name, Material Dark. This is marked as translatable="false" because this is a proper name of system-wide UI Theme.  -->
-    <string name="keyboard_theme_material_dark" translatable="false">Material Dark</string>
+    <string name="keyboard_theme_material_dark" translatable="false">Material Dark (AMOLED)</string>
     <!-- The keyboard theme name, Material Light. This is marked as translatable="false" because this is a proper name of system-wide UI Theme.  -->
     <string name="keyboard_theme_material_light" translatable="false">Material Light</string>
     <string name="keyboard_theme_dark_border" translatable="false">Material Dark Border</string>
diff --git a/app/src/main/res/xml-hu-rZZ/kbd_qwerty.xml b/app/src/main/res/xml-hu-rZZ/kbd_qwerty.xml
deleted file mode 100644
index 6909874cc..000000000
--- a/app/src/main/res/xml-hu-rZZ/kbd_qwerty.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
-    xmlns:latin="http://schemas.android.com/apk/res-auto"
->
-    <include
-        latin:keyboardLayout="@xml/rows_qwerty" />
-</Keyboard>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_sign_anusvara.xml b/app/src/main/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
deleted file mode 100644
index 439fda00d..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_sign_anusvara.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
-                 U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
-                 U+093C: "़" DEVANAGARI SIGN NUKTA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignAnusvara"
-                latin:moreKeys="&#x0903;,&#x0901;,&#x093C;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
-                 U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignAnusvara"
-                latin:moreKeys="&#x0903;,&#x0901;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignAnusvara" />
-        </default>
-    </switch>
-    <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignAnusvara"
-        latin:parentStyle="moreKeysDevanagariSignAnusvara"
-        latin:keySpec="&#x0902;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml b/app/src/main/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
deleted file mode 100644
index 1c114b7d7..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_sign_candrabindu.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignCandrabindu"
-                latin:moreKeys="&#x0945;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" />
-        </default>
-    </switch>
-    <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignCandrabindu"
-        latin:parentStyle="moreKeysDevanagariSignCandrabindu"
-        latin:keySpec="&#x0901;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_sign_nukta.xml b/app/src/main/res/xml-v16/keystyle_devanagari_sign_nukta.xml
deleted file mode 100644
index b7eccfc1b..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_sign_nukta.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
-                 U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
-                 U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignNukta"
-                latin:moreKeys="&#x097D;,&#x0970;,&#x093D;" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_romanized">
-            <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignNukta"
-                latin:moreKeys="&#x093C;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignNukta" />
-        </default>
-    </switch>
-    <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignNukta"
-        latin:parentStyle="moreKeysDevanagariSignNukta"
-        latin:keySpec="&#x093C;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_sign_virama.xml b/app/src/main/res/xml-v16/keystyle_devanagari_sign_virama.xml
deleted file mode 100644
index 996a061a5..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_sign_virama.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
-            <key-style
-                latin:styleName="moreKeySpecDevanagariSignVirama"
-                latin:moreKeys="&#x094D;" />
-            <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E
-                 U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignVirama"
-                latin:moreKeys="&#x0945;,&#x090D;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0905: "अ" DEVANAGARI LETTER A -->
-            <key-style
-                latin:styleName="moreKeysDevanagariSignVirama"
-                latin:moreKeys="&#x0905;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariSignVirama" />
-        </default>
-    </switch>
-    <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignVirama"
-        latin:parentStyle="moreKeysDevanagariSignVirama"
-        latin:keySpec="&#x094D;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_sign_visarga.xml b/app/src/main/res/xml-v16/keystyle_devanagari_sign_visarga.xml
deleted file mode 100644
index 71befd936..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_sign_visarga.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariSignVisarga"
-        latin:keySpec="&#x0903;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
deleted file mode 100644
index 076db679f..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_aa.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <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="&#x093E;&#x0902;,&#x093E;&#x0901;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa"
-                latin:moreKeys="&#x093E;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAa"
-                latin:moreKeys="&#x0906;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignAa" />
-        </default>
-    </switch>
-    <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignAa"
-        latin:parentStyle="moreKeysDevanagariVowelSignAa"
-        latin:keySpec="&#x093E;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
deleted file mode 100644
index 91d1de25a..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ai.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x0948;&#x0902;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x0948;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x0910;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_traditional">
-            <!-- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x0936;&#x094D;&#x0930;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignAi" />
-        </default>
-    </switch>
-    <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignAi"
-        latin:parentStyle="moreKeysDevanagariVowelSignAi"
-        latin:keySpec="&#x0948;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
deleted file mode 100644
index 50cfd6500..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_au.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!--U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x094C;&#x0902;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x094C;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x0914;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignAu" />
-        </default>
-    </switch>
-    <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignAu"
-        latin:parentStyle="moreKeysDevanagariVowelSignAu"
-        latin:keySpec="&#x094C;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
deleted file mode 100644
index 805446a2c..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_e.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraE"
-                latin:moreKeys="&#x0945;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraE"
-                latin:moreKeys="&#x090D;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" />
-        </default>
-    </switch>
-    <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignCandraE"
-        latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
-        latin:keySpec="&#x0945;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
deleted file mode 100644
index 5e446c012..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_candra_o.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraO"
-                latin:moreKeys="&#x0949;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignCandraO"
-                latin:moreKeys="&#x0911;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" />
-        </default>
-    </switch>
-    <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignCandraO"
-        latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
-        latin:keySpec="&#x0949;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
deleted file mode 100644
index bed052e9b..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_e.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x0947;&#x0902;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x0947;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x090F;" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_traditional">
-            <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
-                 U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x0903;,&#x093D;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
-        </default>
-    </switch>
-    <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignE"
-        latin:parentStyle="moreKeysDevanagariVowelSignE"
-        latin:keySpec="&#x0947;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
deleted file mode 100644
index 60d27119f..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_i.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x093F;&#x0902;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x093F;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0907: "इ" DEVANAGARI LETTER I -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x0907;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignI" />
-        </default>
-    </switch>
-    <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignI"
-        latin:parentStyle="moreKeysDevanagariVowelSignI"
-        latin:keySpec="&#x093F;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
deleted file mode 100644
index 3e3b56c51..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_ii.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x0940;&#x0902;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x0940;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0908: "ई" DEVANAGARI LETTER II -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x0908;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignIi" />
-        </default>
-    </switch>
-    <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignIi"
-        latin:parentStyle="moreKeysDevanagariVowelSignIi"
-        latin:keySpec="&#x0940;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
deleted file mode 100644
index 608a0980d..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_o.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
-                 U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
-                 U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x094B;&#x0902;,&#x0949;,&#x094A;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x094B;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x0913;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignO" />
-        </default>
-    </switch>
-    <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignO"
-        latin:parentStyle="moreKeysDevanagariVowelSignO"
-        latin:keySpec="&#x094B;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
deleted file mode 100644
index acb60710c..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_u.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <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="&#x0941;&#x0902;,&#x0941;&#x0901;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU"
-                latin:moreKeys="&#x0941;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0909: "उ" DEVANAGARI LETTER U -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignU"
-                latin:moreKeys="&#x0909;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignU" />
-        </default>
-    </switch>
-    <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignU"
-        latin:parentStyle="moreKeysDevanagariVowelSignU"
-        latin:keySpec="&#x0941;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
deleted file mode 100644
index 1adc3bb55..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_uu.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <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="&#x0942;&#x0902;,&#x0942;&#x0901;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu"
-                latin:moreKeys="&#x0942;,%" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignUu"
-                latin:moreKeys="&#x090A;,%" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignUu" />
-        </default>
-    </switch>
-    <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignUu"
-        latin:parentStyle="moreKeysDevanagariVowelSignUu"
-        latin:keySpec="&#x0942;" />
-</merge>
diff --git a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml b/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
deleted file mode 100644
index 268c7d8f9..000000000
--- a/app/src/main/res/xml-v16/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The code point U+25CC for key label is needed because the font rendering system prior to
-     API version 16 can't automatically render dotted circle for incomplete combining letter
-     of some scripts. The files named res/xml/key_*.xml have this U+25CC hack, although the
-     counterpart files named res/xml-v16/key_*.xml don't have this hack. -->
-<merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <switch>
-        <case latin:keyboardLayoutSet="hindi">
-            <!-- U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x0944;" />
-        </case>
-        <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
-                 U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x090B;,&#x0943;" />
-        </case>
-        <case latin:keyboardLayoutSet="marathi">
-            <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
-                 U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
-                 U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x0931;,&#x090B;,&#x0943;" />
-        </case>
-        <case latin:keyboardLayoutSet="nepali_traditional">
-            <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
-            <key-style
-                latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x0913;" />
-        </case>
-        <default>
-            <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
-        </default>
-    </switch>
-    <!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
-    <key-style
-        latin:styleName="baseKeyDevanagariVowelSignVocalicR"
-        latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keySpec="&#x0943;" />
-</merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_sign_anusvara.xml b/app/src/main/res/xml/keystyle_devanagari_sign_anusvara.xml
index f42e525e5..439fda00d 100644
--- a/app/src/main/res/xml/keystyle_devanagari_sign_anusvara.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_sign_anusvara.xml
@@ -25,31 +25,27 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0903: "ः‍" DEVANAGARI SIGN VISARGA
+            <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
                  U+093C: "़" DEVANAGARI SIGN NUKTA -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignAnusvara"
-                latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x25CC;&#x0901;|&#x0901;,&#x25CC;&#x093C;|&#x093C;" />
+                latin:moreKeys="&#x0903;,&#x0901;,&#x093C;" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0903: "ः‍" DEVANAGARI SIGN VISARGA
+            <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignAnusvara"
-                latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x25CC;&#x0901;|&#x0901;" />
+                latin:moreKeys="&#x0903;,&#x0901;" />
         </case>
         <default>
             <key-style latin:styleName="moreKeysDevanagariSignAnusvara" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
+    <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignAnusvara"
         latin:parentStyle="moreKeysDevanagariSignAnusvara"
-        latin:keySpec="&#x25CC;&#x0902;|&#x0902;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0902;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_sign_candrabindu.xml b/app/src/main/res/xml/keystyle_devanagari_sign_candrabindu.xml
index be48eef04..1c114b7d7 100644
--- a/app/src/main/res/xml/keystyle_devanagari_sign_candrabindu.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_sign_candrabindu.xml
@@ -25,21 +25,18 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
+            <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignCandrabindu"
-                latin:moreKeys="&#x25CC;&#x0945;|&#x0945;" />
+                latin:moreKeys="&#x0945;" />
         </case>
         <default>
             <key-style latin:styleName="moreKeysDevanagariSignCandrabindu" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
+    <!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU -->
     <key-style
         latin:styleName="baseKeyDevanagariSignCandrabindu"
         latin:parentStyle="moreKeysDevanagariSignCandrabindu"
-        latin:keySpec="&#x25CC;&#x0901;|&#x0901;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0901;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_sign_nukta.xml b/app/src/main/res/xml/keystyle_devanagari_sign_nukta.xml
index 66e2997a5..b7eccfc1b 100644
--- a/app/src/main/res/xml/keystyle_devanagari_sign_nukta.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_sign_nukta.xml
@@ -25,30 +25,26 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
+            <!-- U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP
                  U+0970: "॰" DEVANAGARI ABBREVIATION SIGN
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignNukta"
-                latin:moreKeys="&#x25CC;&#x097D;|&#x097D;,&#x25CC;&#x0970;|&#x0970;,&#x25CC;&#x093D;|&#x093D;" />
+                latin:moreKeys="&#x097D;,&#x0970;,&#x093D;" />
         </case>
         <case latin:keyboardLayoutSet="nepali_romanized">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+093C: "़" DEVANAGARI SIGN NUKTA -->
+            <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignNukta"
-                latin:moreKeys="&#x25CC;&#x093C;|&#x093C;" />
+                latin:moreKeys="&#x093C;" />
         </case>
         <default>
             <key-style latin:styleName="moreKeysDevanagariSignNukta" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+093C: "़" DEVANAGARI SIGN NUKTA -->
+    <!-- U+093C: "़" DEVANAGARI SIGN NUKTA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignNukta"
         latin:parentStyle="moreKeysDevanagariSignNukta"
-        latin:keySpec="&#x25CC;&#x093C;|&#x093C;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x093C;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_sign_virama.xml b/app/src/main/res/xml/keystyle_devanagari_sign_virama.xml
index 50900e139..996a061a5 100644
--- a/app/src/main/res/xml/keystyle_devanagari_sign_virama.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_sign_virama.xml
@@ -25,17 +25,15 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+094D: "्" DEVANAGARI SIGN VIRAMA -->
+            <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
             <key-style
                 latin:styleName="moreKeySpecDevanagariSignVirama"
-                latin:moreKeys="&#x25CC;&#x094D;|&#x094D;" />
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E
+                latin:moreKeys="&#x094D;" />
+            <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E
                  U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariSignVirama"
-                latin:moreKeys="&#x25CC;&#x0945;|&#x0945;,&#x090D;" />
+                latin:moreKeys="&#x0945;,&#x090D;" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+0905: "अ" DEVANAGARI LETTER A -->
@@ -47,11 +45,9 @@
             <key-style latin:styleName="moreKeysDevanagariSignVirama" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+094D: "्" DEVANAGARI SIGN VIRAMA -->
+    <!-- U+094D: "्" DEVANAGARI SIGN VIRAMA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignVirama"
         latin:parentStyle="moreKeysDevanagariSignVirama"
-        latin:keySpec="&#x25CC;&#x094D;|&#x094D;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x094D;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_sign_visarga.xml b/app/src/main/res/xml/keystyle_devanagari_sign_visarga.xml
index bd90b24bf..71befd936 100644
--- a/app/src/main/res/xml/keystyle_devanagari_sign_visarga.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_sign_visarga.xml
@@ -23,10 +23,8 @@
      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-auto">
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0903: "ः" DEVANAGARI SIGN VISARGA -->
+    <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
     <key-style
         latin:styleName="baseKeyDevanagariSignVisarga"
-        latin:keySpec="&#x25CC;&#x0903;|&#x0903;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0903;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_aa.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_aa.xml
index e91696cba..076db679f 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_aa.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_aa.xml
@@ -25,19 +25,17 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA
+            <!-- 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="&#x25CC;&#x093E;&#x0902;|&#x093E;&#x0902;,&#x25CC;&#x093E;&#x0901;|&#x093E;&#x0901;,%" />
+                latin:moreKeys="&#x093E;&#x0902;,&#x093E;&#x0901;,%" />
         </case>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
+            <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAa"
-                latin:moreKeys="&#x25CC;&#x093E;|&#x093E;,%" />
+                latin:moreKeys="&#x093E;,%" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+0906: "आ" DEVANAGARI LETTER AA -->
@@ -49,11 +47,9 @@
             <key-style latin:styleName="moreKeysDevanagariVowelSignAa" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
+    <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignAa"
         latin:parentStyle="moreKeysDevanagariVowelSignAa"
-        latin:keySpec="&#x25CC;&#x093E;|&#x093E;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x093E;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ai.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ai.xml
index 1b4731ee7..91d1de25a 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ai.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ai.xml
@@ -25,18 +25,16 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
+            <!-- U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x25CC;&#x0948;&#x0902;|&#x0948;&#x0902;,%" />
+                latin:moreKeys="&#x0948;&#x0902;,%" />
         </case>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
+            <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAi"
-                latin:moreKeys="&#x25CC;&#x0948;|&#x0948;,%" />
+                latin:moreKeys="&#x0948;,%" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+0910: "ऐ" DEVANAGARI LETTER AI -->
@@ -54,11 +52,9 @@
             <key-style latin:styleName="moreKeysDevanagariVowelSignAi" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
+    <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignAi"
         latin:parentStyle="moreKeysDevanagariVowelSignAi"
-        latin:keySpec="&#x25CC;&#x0948;|&#x0948;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0948;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_au.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_au.xml
index 743ab00ca..50cfd6500 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_au.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_au.xml
@@ -25,18 +25,16 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
+            <!--U+094C/U+0902: "ौं" DEVANAGARI VOWEL SIGN AU/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x25CC;&#x094C;&#x0902;|&#x094C;&#x0902;,%" />
+                latin:moreKeys="&#x094C;&#x0902;,%" />
         </case>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
+            <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignAu"
-                latin:moreKeys="&#x25CC;&#x094C;|&#x094C;,%" />
+                latin:moreKeys="&#x094C;,%" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+0914: "औ" DEVANAGARI LETTER AU -->
@@ -52,6 +50,5 @@
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignAu"
         latin:parentStyle="moreKeysDevanagariVowelSignAu"
-        latin:keySpec="&#x25CC;&#x094C;|&#x094C;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x094C;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
index 02d89710e..805446a2c 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_e.xml
@@ -25,11 +25,10 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
+            <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraE"
-                latin:moreKeys="&#x25CC;&#x0945;|&#x0945;" />
+                latin:moreKeys="&#x0945;" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+090D: "ऍ" DEVANAGARI LETTER CANDRA E -->
@@ -41,11 +40,9 @@
             <key-style latin:styleName="moreKeysDevanagariVowelSignCandraE" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
+    <!-- U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignCandraE"
         latin:parentStyle="moreKeysDevanagariVowelSignCandraE"
-        latin:keySpec="&#x25CC;&#x0945;|&#x0945;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0945;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
index 0454a5daa..5e446c012 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_candra_o.xml
@@ -25,11 +25,10 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
+            <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignCandraO"
-                latin:moreKeys="&#x25CC;&#x0949;|&#x0949;" />
+                latin:moreKeys="&#x0949;" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
@@ -41,11 +40,9 @@
             <key-style latin:styleName="moreKeysDevanagariVowelSignCandraO" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
+    <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignCandraO"
         latin:parentStyle="moreKeysDevanagariVowelSignCandraO"
-        latin:keySpec="&#x25CC;&#x0949;|&#x0949;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0949;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_e.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_e.xml
index 4e15e1cb1..bed052e9b 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_e.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_e.xml
@@ -25,18 +25,16 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
+            <!-- U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x25CC;&#x0947;&#x0902;|&#x0947;&#x0902;" />
+                latin:moreKeys="&#x0947;&#x0902;" />
         </case>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0947: "े" DEVANAGARI VOWEL SIGN E -->
+            <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x25CC;&#x0947;|&#x0947;" />
+                latin:moreKeys="&#x0947;" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+090F: "ए" DEVANAGARI LETTER SHORT E -->
@@ -45,22 +43,19 @@
                 latin:moreKeys="&#x090F;" />
         </case>
         <case latin:keyboardLayoutSet="nepali_traditional">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0903: "ः‍" DEVANAGARI SIGN VISARGA
+            <!-- U+0903: "ः‍" DEVANAGARI SIGN VISARGA
                  U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignE"
-                latin:moreKeys="&#x25CC;&#x0903;|&#x0903;,&#x093D;" />
+                latin:moreKeys="&#x0903;,&#x093D;" />
         </case>
         <default>
             <key-style latin:styleName="moreKeysDevanagariVowelSignE" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0947: "े" DEVANAGARI VOWEL SIGN E -->
+    <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignE"
         latin:parentStyle="moreKeysDevanagariVowelSignE"
-        latin:keySpec="&#x25CC;&#x0947;|&#x0947;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0947;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_i.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_i.xml
index a25d01b3b..60d27119f 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_i.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_i.xml
@@ -25,18 +25,16 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
+            <!-- U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x093F;&#x25CC;&#x0902;|&#x093F;&#x0902;" />
+                latin:moreKeys="&#x093F;&#x0902;" />
         </case>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
+            <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignI"
-                latin:moreKeys="&#x25CC;&#x093F;|&#x093F;" />
+                latin:moreKeys="&#x093F;" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+0907: "इ" DEVANAGARI LETTER I -->
@@ -48,11 +46,9 @@
             <key-style latin:styleName="moreKeysDevanagariVowelSignI" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
+    <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignI"
         latin:parentStyle="moreKeysDevanagariVowelSignI"
-        latin:keySpec="&#x25CC;&#x093F;|&#x093F;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x093F;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ii.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ii.xml
index 8399a70f2..3e3b56c51 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ii.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_ii.xml
@@ -25,18 +25,16 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
+            <!-- U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x25CC;&#x0940;&#x0902;|&#x0940;&#x0902;,%" />
+                latin:moreKeys="&#x0940;&#x0902;,%" />
         </case>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
+            <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignIi"
-                latin:moreKeys="&#x25CC;&#x0940;|&#x0940;,%" />
+                latin:moreKeys="&#x0940;,%" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+0908: "ई" DEVANAGARI LETTER II -->
@@ -48,11 +46,9 @@
             <key-style latin:styleName="moreKeysDevanagariVowelSignIi" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
+    <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignIi"
         latin:parentStyle="moreKeysDevanagariVowelSignIi"
-        latin:keySpec="&#x25CC;&#x0940;|&#x0940;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0940;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_o.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_o.xml
index 374cb599c..608a0980d 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_o.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_o.xml
@@ -25,20 +25,18 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
+            <!-- U+094B/U+0902: "ों" DEVANAGARI VOWEL SIGN O/DEVANAGARI SIGN ANUSVARA
                  U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O
                  U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x25CC;&#x094B;&#x0902;|&#x094B;&#x0902;,&#x25CC;&#x0949;|&#x0949;,&#x25CC;&#x094A;|&#x094A;" />
+                latin:moreKeys="&#x094B;&#x0902;,&#x0949;,&#x094A;" />
         </case>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
+            <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignO"
-                latin:moreKeys="&#x25CC;&#x094B;|&#x094B;" />
+                latin:moreKeys="&#x094B;" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
@@ -50,11 +48,9 @@
             <key-style latin:styleName="moreKeysDevanagariVowelSignO" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
+    <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignO"
         latin:parentStyle="moreKeysDevanagariVowelSignO"
-        latin:keySpec="&#x25CC;&#x094B;|&#x094B;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x094B;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_u.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_u.xml
index e0b1e0e06..acb60710c 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_u.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_u.xml
@@ -25,19 +25,17 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0941/U+0902: "ुं" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA
+            <!-- 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="&#x25CC;&#x0941;&#x0902;|&#x0941;&#x0902;,&#x25CC;&#x0941;&#x0901;|&#x0941;&#x0901;" />
+                latin:moreKeys="&#x0941;&#x0902;,&#x0941;&#x0901;" />
         </case>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
+            <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignU"
-                latin:moreKeys="&#x25CC;&#x0941;|&#x0941;" />
+                latin:moreKeys="&#x0941;" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+0909: "उ" DEVANAGARI LETTER U -->
@@ -49,11 +47,9 @@
             <key-style latin:styleName="moreKeysDevanagariVowelSignU" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
+    <!-- U+0941: "ु" DEVANAGARI VOWEL SIGN U -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignU"
         latin:parentStyle="moreKeysDevanagariVowelSignU"
-        latin:keySpec="&#x25CC;&#x0941;|&#x0941;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0941;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_uu.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_uu.xml
index abdc4d6fd..1adc3bb55 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_uu.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_uu.xml
@@ -25,19 +25,17 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA
+            <!-- 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="&#x25CC;&#x0942;&#x0902;|&#x0942;&#x0902;,&#x25CC;&#x0942;&#x0901;|&#x0942;&#x0901;,%" />
+                latin:moreKeys="&#x0942;&#x0902;,&#x0942;&#x0901;,%" />
         </case>
         <case latin:keyboardLayoutSet="hindi_compact">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
+            <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignUu"
-                latin:moreKeys="&#x25CC;&#x0942;|&#x0942;,%" />
+                latin:moreKeys="&#x0942;,%" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+090A: "ऊ" DEVANAGARI LETTER UU -->
@@ -49,11 +47,9 @@
             <key-style latin:styleName="moreKeysDevanagariVowelSignUu" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
+    <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignUu"
         latin:parentStyle="moreKeysDevanagariVowelSignUu"
-        latin:keySpec="&#x25CC;&#x0942;|&#x0942;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0942;" />
 </merge>
diff --git a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
index 1381b3f0e..268c7d8f9 100644
--- a/app/src/main/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
+++ b/app/src/main/res/xml/keystyle_devanagari_vowel_sign_vocalic_r.xml
@@ -25,28 +25,25 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <switch>
         <case latin:keyboardLayoutSet="hindi">
-            <!-- U+25CC: "◌" DOTTED CIRCLE
-                 U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
+            <!-- U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x25CC;&#x0944;|&#x0944;" />
+                latin:moreKeys="&#x0944;" />
         </case>
         <case latin:keyboardLayoutSet="hindi_compact">
             <!-- U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
-                 U+25CC: "◌" DOTTED CIRCLE
                  U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x090B;,&#x25CC;&#x0943;|&#x0943;" />
+                latin:moreKeys="&#x090B;,&#x0943;" />
         </case>
         <case latin:keyboardLayoutSet="marathi">
             <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
                  U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
-                 U+25CC: "◌" DOTTED CIRCLE
                  U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
             <key-style
                 latin:styleName="moreKeysDevanagariVowelSignVocalicR"
-                latin:moreKeys="&#x0931;,&#x090B;,&#x25CC;&#x0943;|&#x0943;" />
+                latin:moreKeys="&#x0931;,&#x090B;,&#x0943;" />
         </case>
         <case latin:keyboardLayoutSet="nepali_traditional">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O -->
@@ -58,11 +55,9 @@
             <key-style latin:styleName="moreKeysDevanagariVowelSignVocalicR" />
         </default>
     </switch>
-    <!-- U+25CC: "◌" DOTTED CIRCLE
-         U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
+    <!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R -->
     <key-style
         latin:styleName="baseKeyDevanagariVowelSignVocalicR"
         latin:parentStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keySpec="&#x25CC;&#x0943;|&#x0943;"
-        latin:keyLabelFlags="followKeyLetterRatio" />
+        latin:keySpec="&#x0943;" />
 </merge>