From 6aaa4973935659e40b3300e9326b888cf381545d Mon Sep 17 00:00:00 2001
From: Luke Videckis
Date: Sat, 11 Mar 2023 08:43:17 -0700
Subject: New Hindi layout (#313)

* New Hindi layout
* Update default layout for Marathi, Nepali
* Consistent naming for Devanagari layouts---
 res/values/arrays.xml    |  6 ++++--
 res/xml/devanagari_1.xml | 37 +++++++++++++++++++++++++++++++++++++
 res/xml/devanagari_2.xml | 30 ++++++++++++++++++++++++++++++
 res/xml/hindi.xml        | 37 -------------------------------------
 res/xml/method.xml       |  4 +++-
 5 files changed, 74 insertions(+), 40 deletions(-)
 create mode 100644 res/xml/devanagari_1.xml
 create mode 100644 res/xml/devanagari_2.xml
 delete mode 100644 res/xml/hindi.xml

(limited to 'res')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 989ad32..dacc0b4 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -28,7 +28,8 @@
     <item>bone</item>
     <item>jcuken_ua</item>
     <item>bangla</item>
-    <item>hindi</item>
+    <item>devanagari_1</item>
+    <item>devanagari_2</item>
     <item>he_il_1452_1</item>
     <item>he_il_1452_2</item>
     <item>custom</item>
@@ -61,7 +62,8 @@
     <item>Bone</item>
     <item>ЙЦУКЕН (Українська)</item>
     <item>বাংলা</item>
-    <item>हिन्दी</item>
+    <item>देवनागरी (हिंदी)-1</item>
+    <item>देवनागरी (हिंदी)-2</item>
     <item>Hebrew SI-1452-1</item>
     <item>Hebrew SI-1452-2</item>
     <item>@string/pref_layout_e_custom</item>
diff --git a/res/xml/devanagari_1.xml b/res/xml/devanagari_1.xml
new file mode 100644
index 0000000..a8787a4
--- /dev/null
+++ b/res/xml/devanagari_1.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key key0="ौ" key1="औ" key2="₹" key3="esc" key4="१"/>
+    <key key0="ै" key1="ऐ" key2="ऍ" key3="¶" key4="२"/>
+    <key key0="ा" key1="आ" key2="ॅ" key3="ग़" key4="३"/>
+    <key key0="ी" key1="ई" key2="ज्ञ" key3="ज़" key4="४"/>
+    <key key0="ू" key1="ऊ" key2="त्र" key3="ऩ" key4="५"/>
+    <key key0="ब" key1="भ" key2="क्ष" key3="÷" key4="६"/>
+    <key key0="ह" key1="ङ" key2="श्र" key3="×" key4="७"/>
+    <key key0="ग" key1="घ" key2="ः" key3="=" key4="८"/>
+    <key key0="द" key1="ध" key2="ऋ" key3="+" key4="९"/>
+    <key key0="ज" key1="झ" key2="ृ" key3="-" key4="०"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="ो" key1="ओ" key2="ॉ" key3="tab" key4="ऑ"/>
+    <key key0="े" key1="ए" key2="ञ" key3="~" key4="॰"/>
+    <key key0="्" key1="अ" key2="़" key3="ऽ" key4="ऺ"/>
+    <key key0="ि" key1="इ" key2="ढ" key3="॥" key4="ॄ"/>
+    <key key0="ु" key1="उ" key2="ड" key3="\\" key4="/"/>
+    <key key0="प" key1="फ" key2="छ" key3="&lt;" key4="&gt;"/>
+    <key key0="र" key1="ऱ" key2="च" key3="[" key4="]"/>
+    <key key0="क" key1="ख" key2="क़" key3="{" key4="}"/>
+    <key key0="त" key1="थ" key2="ख़" key3="(" key4=")"/>
+  </row>
+  <row>
+    <key width="1.4" key0="shift" key2="loc capslock"/>
+    <key shift="0.1" key0="ट" key1="ठ" key2="ड़" key3="\#" key4="*"/>
+    <key key0="ं" key1="ँ" key2="।" key3="ॐ" key4="\@"/>
+    <key key0="म" key1="ण" key2="य" key3="य़" key4="%"/>
+    <key key0="न" key1="" key2="।" key3=":" key4="&amp;"/>
+    <key key0="व" key1="" key2="ढ़" key3=";" key4="."/>
+    <key key0="ल" key1="ळ" key2="फ़" key3="!" key4=","/>
+    <key key0="स" key1="श" key2="ष" key3="\?" key4="।"/>
+    <key shift="0.1" width="1.4" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
diff --git a/res/xml/devanagari_2.xml b/res/xml/devanagari_2.xml
new file mode 100644
index 0000000..7e1f770
--- /dev/null
+++ b/res/xml/devanagari_2.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard>
+  <row>
+    <key shift="0.35" width="0.9" key0="क" key1="ख" key2="घ" key3="ङ"  key4="ग"/>
+    <key              width="0.9" key0="च" key1="छ" key2="झ" key3="ञ"  key4="ज"/>
+    <key              width="0.9" key0="ट" key1="ठ" key2="ढ" key3="ण"  key4="ड"/>
+    <key              width="0.9" key0="त" key1="थ" key2="ध" key3="न"  key4="द"/>
+    <key              width="0.9" key0="प" key1="फ" key2="भ" key3="म"  key4="ब"/>
+    <key              width="0.9" key0="र" key1="ज्ञ" key2="ल" key3="य"  key4="व"/>
+    <key              width="0.9" key0="ह" key1="श" key2="ळ" key3="स"  key4="ष"/>
+  </row>
+  <row>
+    <key shift="0.35" width="0.9" key0="ा" key1="अ" key2="आ"/>
+    <key              width="0.9" key0="ि" key1="इ"/>
+    <key              width="0.9" key0="ी" key1="ई"/>
+    <key              width="0.9" key0="ु" key1="उ" key2="ऊ" key4="ू"/>
+    <key              width="0.9" key0="े" key1="ए" key2="ऋ" key4="ृ"/>
+    <key              width="0.9" key0="ै" key1="ऐ" key2="ऌ" key4="ॢ"/>
+    <key              width="0.9" key0="ो" key1="ओ" key2="औ" key4="ौ"/>
+  </row>
+  <row>
+    <key key0="्" key2="tab" key4="esc"/>
+    <key key0="ँ" key1="₹" key2="॑" key3="ॖ" key4="॓"/>
+    <key key0="ं" key1="ॐ" key2="ऽ" key3="ः" key4="&quot;"/>
+    <key key0="।" key1="," key2=";" key3="!" key4="\?"/>
+    <key key0="़" key1="॰" key2="०" key3="-" key4="॒"/>
+    <key key0="५" key1="१" key2="३" key3="७" key4="९" key5="४" key6="६" key7="२" key8="८"/>
+    <key key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
\ No newline at end of file
diff --git a/res/xml/hindi.xml b/res/xml/hindi.xml
deleted file mode 100644
index a8787a4..0000000
--- a/res/xml/hindi.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<keyboard>
-  <row>
-    <key key0="ौ" key1="औ" key2="₹" key3="esc" key4="१"/>
-    <key key0="ै" key1="ऐ" key2="ऍ" key3="¶" key4="२"/>
-    <key key0="ा" key1="आ" key2="ॅ" key3="ग़" key4="३"/>
-    <key key0="ी" key1="ई" key2="ज्ञ" key3="ज़" key4="४"/>
-    <key key0="ू" key1="ऊ" key2="त्र" key3="ऩ" key4="५"/>
-    <key key0="ब" key1="भ" key2="क्ष" key3="÷" key4="६"/>
-    <key key0="ह" key1="ङ" key2="श्र" key3="×" key4="७"/>
-    <key key0="ग" key1="घ" key2="ः" key3="=" key4="८"/>
-    <key key0="द" key1="ध" key2="ऋ" key3="+" key4="९"/>
-    <key key0="ज" key1="झ" key2="ृ" key3="-" key4="०"/>
-  </row>
-  <row>
-    <key shift="0.5" key0="ो" key1="ओ" key2="ॉ" key3="tab" key4="ऑ"/>
-    <key key0="े" key1="ए" key2="ञ" key3="~" key4="॰"/>
-    <key key0="्" key1="अ" key2="़" key3="ऽ" key4="ऺ"/>
-    <key key0="ि" key1="इ" key2="ढ" key3="॥" key4="ॄ"/>
-    <key key0="ु" key1="उ" key2="ड" key3="\\" key4="/"/>
-    <key key0="प" key1="फ" key2="छ" key3="&lt;" key4="&gt;"/>
-    <key key0="र" key1="ऱ" key2="च" key3="[" key4="]"/>
-    <key key0="क" key1="ख" key2="क़" key3="{" key4="}"/>
-    <key key0="त" key1="थ" key2="ख़" key3="(" key4=")"/>
-  </row>
-  <row>
-    <key width="1.4" key0="shift" key2="loc capslock"/>
-    <key shift="0.1" key0="ट" key1="ठ" key2="ड़" key3="\#" key4="*"/>
-    <key key0="ं" key1="ँ" key2="।" key3="ॐ" key4="\@"/>
-    <key key0="म" key1="ण" key2="य" key3="य़" key4="%"/>
-    <key key0="न" key1="" key2="।" key3=":" key4="&amp;"/>
-    <key key0="व" key1="" key2="ढ़" key3=";" key4="."/>
-    <key key0="ल" key1="ळ" key2="फ़" key3="!" key4=","/>
-    <key key0="स" key1="श" key2="ष" key3="\?" key4="।"/>
-    <key shift="0.1" width="1.4" key0="backspace" key2="delete"/>
-  </row>
-</keyboard>
diff --git a/res/xml/method.xml b/res/xml/method.xml
index d81e300..8e91024 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -11,7 +11,9 @@
   <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_es,extra_keys=accent_grave|accent_aigu|accent_tilde|accent_trema|€"/>
   <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
   <subtype android:label="%s" android:languageTag="he" android:imeSubtypeLocale="he_IL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=he_il_1452_1,extra_keys=₪|€"/>
-  <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=hindi,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=devanagari_1,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="mr" android:imeSubtypeLocale="mr_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=devanagari_1,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="ne" android:imeSubtypeLocale="ne_NE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=devanagari_1,extra_keys=₹"/>
   <subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_hu,extra_keys=accent_aigu|accent_trema|accent_ogonek|€"/>
   <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=accent_grave|accent_aigu|€"/>
   <subtype android:label="%s" android:languageTag="ko" android:imeSubtypeLocale="ko_KR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_ko"/>
-- 
cgit v1.2.3