Update Hindi keyboard
* Remove "U+090E: DEVANAGARI LETTER SHORT E" from 3rd row
* Remove "U+0946: DEVANAGARI VOWEL SIGN SHORT E" from 3rd row
* Remove digit and Devanagari digit more keys from shifted layout
* Replace digit keys on symbol layout with Devanagari digit keys
* Enlarge 3rd row of phone layout slightly
Bug: 5964777
Change-Id: I2a4f85bf11fbec3820a79a026d95c8f73a9cf604
diff --git a/java/res/values-hi/donottranslate-more-keys.xml b/java/res/values-hi/donottranslate-more-keys.xml
new file mode 100644
index 0000000..19bcb9d
--- /dev/null
+++ b/java/res/values-hi/donottranslate-more-keys.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
+ <string name="keylabel_for_symbols_1">१</string>
+ <!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
+ <string name="keylabel_for_symbols_2">२</string>
+ <!-- U+0969: "३" DEVANAGARI DIGIT THREE -->
+ <string name="keylabel_for_symbols_3">३</string>
+ <!-- U+096A: "४" DEVANAGARI DIGIT FOUR -->
+ <string name="keylabel_for_symbols_4">४</string>
+ <!-- U+096B: "५" DEVANAGARI DIGIT FIVE -->
+ <string name="keylabel_for_symbols_5">५</string>
+ <!-- U+096C: "६" DEVANAGARI DIGIT SIX -->
+ <string name="keylabel_for_symbols_6">६</string>
+ <!-- U+096D: "७" DEVANAGARI DIGIT SEVEN -->
+ <string name="keylabel_for_symbols_7">७</string>
+ <!-- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
+ <string name="keylabel_for_symbols_8">८</string>
+ <!-- U+096F: "९" DEVANAGARI DIGIT NINE -->
+ <string name="keylabel_for_symbols_9">९</string>
+ <!-- U+0966: "०" DEVANAGARI DIGIT ZERO -->
+ <string name="keylabel_for_symbols_0">०</string>
+ <string name="additional_more_keys_for_symbols_1">1</string>
+ <string name="additional_more_keys_for_symbols_2">2</string>
+ <string name="additional_more_keys_for_symbols_3">3</string>
+ <string name="additional_more_keys_for_symbols_4">4</string>
+ <string name="additional_more_keys_for_symbols_5">5</string>
+ <string name="additional_more_keys_for_symbols_6">6</string>
+ <string name="additional_more_keys_for_symbols_7">7</string>
+ <string name="additional_more_keys_for_symbols_8">8</string>
+ <string name="additional_more_keys_for_symbols_9">9</string>
+ <string name="additional_more_keys_for_symbols_0">0</string>
+</resources>
diff --git a/java/res/xml-sw600dp/rows_hindi.xml b/java/res/xml-sw600dp/rows_hindi.xml
index 6bec7f0..6c98e08 100644
--- a/java/res/xml-sw600dp/rows_hindi.xml
+++ b/java/res/xml-sw600dp/rows_hindi.xml
@@ -44,7 +44,7 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="6.923%p"
+ latin:keyWidth="7.5%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
diff --git a/java/res/xml-sw768dp/rows_hindi.xml b/java/res/xml-sw768dp/rows_hindi.xml
index bb18842..86e925f 100644
--- a/java/res/xml-sw768dp/rows_hindi.xml
+++ b/java/res/xml-sw768dp/rows_hindi.xml
@@ -28,7 +28,8 @@
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelFlags="alignLeft" />
+ latin:keyLabelFlags="alignLeft"
+ latin:keyWidth="7.969%p" />
<include
latin:keyboardLayout="@xml/rowkeys_hindi1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
@@ -37,12 +38,12 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.194%p"
+ latin:keyWidth="7.186%p"
>
<Key
latin:keyStyle="toSymbolKeyStyle"
latin:keyLabelFlags="alignLeft"
- latin:keyWidth="9.375%p" />
+ latin:keyWidth="11.172%p" />
<include
latin:keyboardLayout="@xml/rowkeys_hindi2" />
<Key
@@ -50,15 +51,18 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
- latin:keyWidth="7.135%p"
+ latin:keyWidth="7.040%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="14.375%p" />
+ latin:keyWidth="13.829%p" />
<include
latin:keyboardLayout="@xml/rowkeys_hindi3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
+ <Key
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="fillBoth" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml
index fe54d9e..eb99de9 100644
--- a/java/res/xml/rowkeys_hindi1.xml
+++ b/java/res/xml/rowkeys_hindi1.xml
@@ -26,80 +26,50 @@
latin:keyboardSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
>
<!-- U+0914: "औ" DEVANAGARI LETTER AU
- U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA
- U+0967: "१" DEVANAGARI DIGIT ONE -->
+ U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="औ"
- latin:moreKeys="ऒं,%"
- latin:keyHintLabel="1"
- latin:additionalMoreKeys="१,1" />
+ latin:moreKeys="ऒं" />
<!-- U+0910: "ऐ" DEVANAGARI LETTER AI
- U+0910/U+0902: "ऐं" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA
- U+0968: "२" DEVANAGARI DIGIT TWO -->
+ U+0910/U+0902: "ऐं" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="ऐ"
- latin:moreKeys="ऐं,%"
- latin:keyHintLabel="2"
- latin:additionalMoreKeys="२,2" />
+ latin:moreKeys="ऐं" />
<!-- U+0906: "आ" DEVANAGARI LETTER AA
U+0906/U+0902: "आं" DEVANAGARI LETTER AA/DEVANAGARI SIGN ANUSVARA
- U+0906/U+0901: "आँ" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU
- U+0969: "३" DEVANAGARI DIGIT THREE -->
+ U+0906/U+0901: "आँ" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU -->
<Key
latin:keyLabel="आ"
- latin:moreKeys="आं,आँ,%"
- latin:keyHintLabel="3"
- latin:additionalMoreKeys="३,3" />
+ latin:moreKeys="आं,आँ" />
<!-- U+0908: "ई" DEVANAGARI LETTER II
- U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA
- U+096A: "४" DEVANAGARI DIGIT FOUR -->
+ U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="ई"
- latin:moreKeys="ईं,%"
- latin:keyHintLabel="4"
- latin:additionalMoreKeys="४,4" />
+ latin:moreKeys="ईं" />
<!-- U+090A: "ऊ" DEVANAGARI LETTER UU
U+090A/U+0902: "ऊं" DEVANAGARI LETTER UU/DEVANAGARI SIGN ANUSVARA
- U+090A/U+0901: "ऊँ" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU
- U+096B: "५" DEVANAGARI DIGIT FIVE -->
+ U+090A/U+0901: "ऊँ" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU -->
<Key
latin:keyLabel="ऊ"
- latin:moreKeys="ऊं,ऊँ,%"
- latin:keyHintLabel="5"
- latin:additionalMoreKeys="५,5" />
- <!-- U+092D: "भ" DEVANAGARI LETTER BHA
- U+096C: "६" DEVANAGARI DIGIT SIX -->
+ latin:moreKeys="ऊं,ऊँ" />
+ <!-- U+092D: "भ" DEVANAGARI LETTER BHA -->
<Key
- latin:keyLabel="भ"
- latin:keyHintLabel="6"
- latin:additionalMoreKeys="६,6" />
- <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA
- U+096D: "७" DEVANAGARI DIGIT SEVEN -->
+ latin:keyLabel="भ" />
+ <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA -->
<Key
- latin:keyLabel="ः"
- latin:keyHintLabel="7"
- latin:additionalMoreKeys="७,7" />
- <!-- U+0918: "घ" DEVANAGARI LETTER GHA
- U+096E: "८" DEVANAGARI DIGIT EIGHT -->
+ latin:keyLabel="ः" />
+ <!-- U+0918: "घ" DEVANAGARI LETTER GHA -->
<Key
- latin:keyLabel="घ"
- latin:keyHintLabel="8"
- latin:additionalMoreKeys="८,8" />
+ latin:keyLabel="घ" />
<!-- U+0927: "ध" DEVANAGARI LETTER DHA
U+0915/U+094D/U+0937: "क्ष" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA
- U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA
- U+096F: "९" DEVANAGARI DIGIT NINE -->
+ U+0936/U+094D/U+0930: "श्र" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
<Key
latin:keyLabel="ध"
- latin:moreKeys="क्ष,श्र,%"
- latin:keyHintLabel="9"
- latin:additionalMoreKeys="9" />
- <!-- U+091D: "झ" DEVANAGARI LETTER JHA
- U+0966: "०" DEVANAGARI DIGIT ZERO -->
+ latin:moreKeys="क्ष,श्र" />
+ <!-- U+091D: "झ" DEVANAGARI LETTER JHA -->
<Key
- latin:keyLabel="झ"
- latin:keyHintLabel="0"
- latin:additionalMoreKeys="०,0" />
+ latin:keyLabel="झ" />
<!-- U+0922: "ढ" DEVANAGARI LETTER DDHA -->
<Key
latin:keyLabel="ढ" />
diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml
index 7d43d57..c023115 100644
--- a/java/res/xml/rowkeys_hindi3.xml
+++ b/java/res/xml/rowkeys_hindi3.xml
@@ -28,9 +28,6 @@
<!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O -->
<Key
latin:keyLabel="ऑ" />
- <!-- U+090E: "ऎ" DEVANAGARI LETTER SHORT E -->
- <Key
- latin:keyLabel="ऎ" />
<!-- U+0901: "ँ" DEVANAGARI SIGN CANDRABINDU
U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E-->
<Key
@@ -66,9 +63,6 @@
<!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O -->
<Key
latin:keyLabel="ॉ" />
- <!-- U+0946: "ॆ" DEVANAGARI VOWEL SIGN SHORT E -->
- <Key
- latin:keyLabel="ॆ" />
<!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA -->
<Key
latin:keyLabel="ं" />
diff --git a/java/res/xml/rows_hindi.xml b/java/res/xml/rows_hindi.xml
index 42d89b5..5c631eb 100644
--- a/java/res/xml/rows_hindi.xml
+++ b/java/res/xml/rows_hindi.xml
@@ -36,11 +36,11 @@
latin:keyboardLayout="@xml/rowkeys_hindi2" />
</Row>
<Row
- latin:keyWidth="7.65%p"
+ latin:keyWidth="8.711%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
- latin:keyWidth="11.75%p" />
+ latin:keyWidth="10.8%p" />
<include
latin:keyboardLayout="@xml/rowkeys_hindi3" />
<Key