From cce6f9ee1d61c2bf489b68f52379964a4cba0501 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" <takaoka@google.com> Date: Thu, 20 Sep 2012 11:54:25 +0900 Subject: [PATCH] Use normal font for Hindi keyboard Bug: 6753168 Change-Id: I731a56bce70e1881e176392acfe977de28696063 --- java/res/xml/rowkeys_hindi1.xml | 66 ++++++++++++++++++++++----------- java/res/xml/rowkeys_hindi2.xml | 66 ++++++++++++++++++++++----------- java/res/xml/rowkeys_hindi3.xml | 51 ++++++++++++++++--------- 3 files changed, 122 insertions(+), 61 deletions(-) diff --git a/java/res/xml/rowkeys_hindi1.xml b/java/res/xml/rowkeys_hindi1.xml index 656ba01c4f..11208045ca 100644 --- a/java/res/xml/rowkeys_hindi1.xml +++ b/java/res/xml/rowkeys_hindi1.xml @@ -29,50 +29,61 @@ U+0912/U+0902: "ऒं" DEVANAGARI LETTER SHORT O//DEVANAGARI SIGN ANUSVARA --> <Key latin:keyLabel="औ" - latin:moreKeys="ऒं" /> + latin:moreKeys="ऒं" + latin:keyLabelFlags="fontNormal" /> <!-- U+0910: "à¤" DEVANAGARI LETTER AI U+0910/U+0902: "à¤à¤‚" DEVANAGARI LETTER AI/DEVANAGARI SIGN ANUSVARA --> <Key latin:keyLabel="ऐ" - latin:moreKeys="ऐं" /> + latin:moreKeys="ऐं" + latin:keyLabelFlags="fontNormal" /> <!-- U+0906: "आ" DEVANAGARI LETTER AA U+0906/U+0902: "आं" DEVANAGARI LETTER AA/DEVANAGARI SIGN ANUSVARA U+0906/U+0901: "आà¤" DEVANAGARI LETTER AA/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="आ" - latin:moreKeys="आं,आँ" /> + latin:moreKeys="आं,आँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0908: "ई" DEVANAGARI LETTER II U+0908/U+0902: "ईं" DEVANAGARI LETTER II/DEVANAGARI SIGN ANUSVARA --> <Key latin:keyLabel="ई" - latin:moreKeys="ईं" /> + latin:moreKeys="ईं" + latin:keyLabelFlags="fontNormal" /> <!-- U+090A: "ऊ" DEVANAGARI LETTER UU U+090A/U+0902: "ऊं" DEVANAGARI LETTER UU/DEVANAGARI SIGN ANUSVARA U+090A/U+0901: "ऊà¤" DEVANAGARI LETTER UU/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="ऊ" - latin:moreKeys="ऊं,ऊँ" /> + latin:moreKeys="ऊं,ऊँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+092D: "à¤" DEVANAGARI LETTER BHA --> <Key - latin:keyLabel="भ" /> + latin:keyLabel="भ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0903: "ः" DEVANAGARI SIGN VISARGA --> <Key - latin:keyLabel="ः" /> + latin:keyLabel="ः" + latin:keyLabelFlags="fontNormal" /> <!-- U+0918: "घ" DEVANAGARI LETTER GHA --> <Key - latin:keyLabel="घ" /> + latin:keyLabel="घ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0927: "ध" DEVANAGARI LETTER DHA U+0915/U+094D/U+0937: "कà¥à¤·" DEVANAGARI LETTER KA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER SSA U+0936/U+094D/U+0930: "शà¥à¤°" DEVANAGARI LETTER SHA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> <Key latin:keyLabel="ध" - latin:moreKeys="क्ष,श्र" /> + latin:moreKeys="क्ष,श्र" + latin:keyLabelFlags="fontNormal" /> <!-- U+091D: "à¤" DEVANAGARI LETTER JHA --> <Key - latin:keyLabel="झ" /> + latin:keyLabel="झ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0922: "ढ" DEVANAGARI LETTER DDHA --> <Key - latin:keyLabel="ढ" /> + latin:keyLabel="ढ" + latin:keyLabelFlags="fontNormal" /> </case> <default> <!-- U+094C: "ौ" DEVANAGARI VOWEL SIGN AU @@ -82,7 +93,8 @@ latin:keyLabel="ौ" latin:moreKeys="ौं,%" latin:keyHintLabel="1" - latin:additionalMoreKeys="१,1" /> + latin:additionalMoreKeys="१,1" + latin:keyLabelFlags="fontNormal" /> <!-- U+0948: "ै" DEVANAGARI VOWEL SIGN AI U+0948/U+0902: "ैं" DEVANAGARI VOWEL SIGN AI/DEVANAGARI SIGN ANUSVARA U+0968: "२" DEVANAGARI DIGIT TWO --> @@ -90,7 +102,8 @@ latin:keyLabel="ै" latin:moreKeys="ैं,%" latin:keyHintLabel="2" - latin:additionalMoreKeys="२,2" /> + latin:additionalMoreKeys="२,2" + latin:keyLabelFlags="fontNormal" /> <!-- U+093E: "ा" DEVANAGARI VOWEL SIGN AA U+093E/U+0902: "ां" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN ANUSVARA U+093E/U+0901: "ाà¤" DEVANAGARI VOWEL SIGN AA/DEVANAGARI SIGN CANDRABINDU @@ -99,7 +112,8 @@ latin:keyLabel="ा" latin:moreKeys="ां,ाँ,%" latin:keyHintLabel="3" - latin:additionalMoreKeys="३,3" /> + latin:additionalMoreKeys="३,3" + latin:keyLabelFlags="fontNormal" /> <!-- U+0940: "ी" DEVANAGARI VOWEL SIGN II U+0940/U+0902: "ीं" DEVANAGARI VOWEL SIGN II/DEVANAGARI SIGN ANUSVARA U+096A: "४" DEVANAGARI DIGIT FOUR --> @@ -107,7 +121,8 @@ latin:keyLabel="ी" latin:moreKeys="ीं,%" latin:keyHintLabel="4" - latin:additionalMoreKeys="४,4" /> + latin:additionalMoreKeys="४,4" + latin:keyLabelFlags="fontNormal" /> <!-- U+0942: "ू" DEVANAGARI VOWEL SIGN UU U+0942/U+0902: "ूं" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN ANUSVARA U+0942/U+0901: "ूà¤" DEVANAGARI VOWEL SIGN UU/DEVANAGARI SIGN CANDRABINDU @@ -116,20 +131,23 @@ latin:keyLabel="ू" latin:moreKeys="ूं,ूँ,%" latin:keyHintLabel="5" - latin:additionalMoreKeys="५,5" /> + latin:additionalMoreKeys="५,5" + latin:keyLabelFlags="fontNormal" /> <!-- U+092C: "ब" DEVANAGARI LETTER BA U+092C/U+0952: "ब॒" DEVANAGARI LETTER BA/DEVANAGARI STRESS SIGN ANUDATTA --> <Key latin:keyLabel="ब" latin:moreKeys="ब॒,%" latin:keyHintLabel="6" - latin:additionalMoreKeys="६,6" /> + latin:additionalMoreKeys="६,6" + latin:keyLabelFlags="fontNormal" /> <!-- U+0939: "ह" DEVANAGARI LETTER HA U+096D: "à¥" DEVANAGARI DIGIT SEVEN --> <Key latin:keyLabel="ह" latin:keyHintLabel="7" - latin:additionalMoreKeys="७,7" /> + latin:additionalMoreKeys="७,7" + latin:keyLabelFlags="fontNormal" /> <!-- U+0917: "ग" DEVANAGARI LETTER GA U+091C/U+094D/U+091E: "जà¥à¤ž" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA U+0917/U+093C: "ग़" DEVANAGARI LETTER GA/DEVANAGARI SIGN NUKTA @@ -139,13 +157,15 @@ latin:keyLabel="ग" latin:moreKeys="ज्ञ,ग़,ग॒,%" latin:keyHintLabel="8" - latin:additionalMoreKeys="८,8" /> + latin:additionalMoreKeys="८,8" + latin:keyLabelFlags="fontNormal" /> <!-- U+0926: "द" DEVANAGARI LETTER DA U+096F: "९" DEVANAGARI DIGIT NINE --> <Key latin:keyLabel="द" latin:keyHintLabel="9" - latin:additionalMoreKeys="9" /> + latin:additionalMoreKeys="9" + latin:keyLabelFlags="fontNormal" /> <!-- U+091C: "ज" DEVANAGARI LETTER JA U+091C/U+0952: "ज॒" DEVANAGARI LETTER JA/DEVANAGARI STRESS SIGN ANUDATTA U+091C/U+094D/U+091E: "जà¥à¤ž" DEVANAGARI LETTER JA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER NYA @@ -155,13 +175,15 @@ latin:keyLabel="ज" latin:moreKeys="ज॒,ज्ञ,ज़,%" latin:keyHintLabel="0" - latin:additionalMoreKeys="०,0" /> + latin:additionalMoreKeys="०,0" + latin:keyLabelFlags="fontNormal" /> <!-- U+0921: "ड" DEVANAGARI LETTER DDA U+0921/U+0952: "ड॒" DEVANAGARI LETTER DDA/DEVANAGARI STRESS SIGN ANUDATTA U+0921/U+093C: "ड़" DEVANAGARI LETTER DDA/DEVANAGARI SIGN NUKTA --> <Key latin:keyLabel="ड" - latin:moreKeys="ड॒,ड़" /> + latin:moreKeys="ड॒,ड़" + latin:keyLabelFlags="fontNormal" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml index 05e3db202a..e7c67dbe7f 100644 --- a/java/res/xml/rowkeys_hindi2.xml +++ b/java/res/xml/rowkeys_hindi2.xml @@ -31,7 +31,8 @@ U+0912: "ऒ" DEVANAGARI LETTER SHORT O --> <Key latin:keyLabel="ओ" - latin:moreKeys="ओं,ऑ,ऒ" /> + latin:moreKeys="ओं,ऑ,ऒ" + latin:keyLabelFlags="fontNormal" /> <!-- U+090F: "à¤" DEVANAGARI LETTER E U+090F/U+0902: "à¤à¤‚" DEVANAGARI LETTER E/DEVANAGARI SIGN ANUSVARA U+090F/U+0901: "à¤à¤" DEVANAGARI LETTER E/DEVANAGARI SIGN CANDRABINDU @@ -39,50 +40,60 @@ U+090E: "ऎ" DEVANAGARI LETTER SHORT E --> <Key latin:keyLabel="ए" - latin:moreKeys="एं,एँ,ऍ,ऎ" /> + latin:moreKeys="एं,एँ,ऍ,ऎ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0905: "अ" DEVANAGARI LETTER A U+0905/U+0902: "अं" DEVANAGARI LETTER A/DEVANAGARI SIGN ANUSVARA U+0905/U+0901: "अà¤" DEVANAGARI LETTER A/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="अ" - latin:moreKeys="अं,अँ" /> + latin:moreKeys="अं,अँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0907: "इ" DEVANAGARI LETTER I U+0907/U+0902: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN ANUSVARA U+0907/U+0901: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="इ" - latin:moreKeys="इं,इँ" /> + latin:moreKeys="इं,इँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0909: "उ" DEVANAGARI LETTER U U+0909/U+0902: "उं" DEVANAGARI LETTER U/DEVANAGARI SIGN ANUSVARA U+0909/U+0901: "उà¤" DEVANAGARI LETTER U/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="उ" - latin:moreKeys="उं,उँ" /> + latin:moreKeys="उं,उँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+092B: "फ" DEVANAGARI LETTER PHA U+092B/U+093C: "फ़" DEVANAGARI LETTER PHA/DEVANAGARI SIGN NUKTA --> <Key latin:keyLabel="फ" - latin:moreKeys="फ़" /> + latin:moreKeys="फ़" + latin:keyLabelFlags="fontNormal" /> <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA U+094D/U+0930: "à¥à¤°" DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA U+0930/U+094D: "रà¥" DEVANAGARI LETTER RA/DEVANAGARI SIGN VIRAMA --> <Key latin:keyLabel="ऱ" - latin:moreKeys="्र,र्" /> + latin:moreKeys="्र,र्" + latin:keyLabelFlags="fontNormal" /> <!-- U+0916: "ख" DEVANAGARI LETTER KHA U+0916/U+093C: "ख़" DEVANAGARI LETTER KHA/DEVANAGARI SIGN NUKTA --> <Key latin:keyLabel="ख" - latin:moreKeys="ख़" /> + latin:moreKeys="ख़" + latin:keyLabelFlags="fontNormal" /> <!-- U+0925: "थ" DEVANAGARI LETTER THA --> <Key - latin:keyLabel="थ" /> + latin:keyLabel="थ" + latin:keyLabelFlags="fontNormal" /> <!-- U+091B: "छ" DEVANAGARI LETTER CHA --> <Key - latin:keyLabel="छ" /> + latin:keyLabel="छ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA --> <Key - latin:keyLabel="ठ" /> + latin:keyLabel="ठ" + latin:keyLabelFlags="fontNormal" /> </case> <default> <!-- U+094B: "ो" DEVANAGARI VOWEL SIGN O @@ -91,52 +102,63 @@ U+094A: "ॊ" DEVANAGARI VOWEL SIGN SHORT O --> <Key latin:keyLabel="ो" - latin:moreKeys="ों,ॉ,ॊ" /> + latin:moreKeys="ों,ॉ,ॊ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0947: "े" DEVANAGARI VOWEL SIGN E U+0947/U+0902: "ें" DEVANAGARI VOWEL SIGN E/DEVANAGARI SIGN ANUSVARA --> <Key latin:keyLabel="े" - latin:moreKeys="ें" /> + latin:moreKeys="ें" + latin:keyLabelFlags="fontNormal" /> <!-- U+094D: "à¥" DEVANAGARI SIGN VIRAMA --> <Key - latin:keyLabel="्" /> + latin:keyLabel="्" + latin:keyLabelFlags="fontNormal" /> <!-- U+093F: "ि" DEVANAGARI VOWEL SIGN I U+093F/U+0902: "िं" DEVANAGARI VOWEL SIGN I/DEVANAGARI SIGN ANUSVARA --> <Key latin:keyLabel="ि" - latin:moreKeys="िं" /> + latin:moreKeys="िं" + latin:keyLabelFlags="fontNormal" /> <!-- U+0941: "à¥" DEVANAGARI VOWEL SIGN U U+0941/U+0902: "à¥à¤‚" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN ANUSVARA U+0941/U+0901: "à¥à¤" DEVANAGARI VOWEL SIGN U/DEVANAGARI SIGN CANDRABINDU --> <Key latin:keyLabel="ु" - latin:moreKeys="ुं,ुँ" /> + latin:moreKeys="ुं,ुँ" + latin:keyLabelFlags="fontNormal" /> <!-- U+092A: "प" DEVANAGARI LETTER PA --> <Key - latin:keyLabel="प" /> + latin:keyLabel="प" + latin:keyLabelFlags="fontNormal" /> <!-- U+0930: "र" DEVANAGARI LETTER RA U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R U+0930/U+093C: "ऱ" DEVANAGARI LETTER RA/DEVANAGARI SIGN NUKTA U+0960: "ॠ" DEVANAGARI LETTER VOCALIC RR --> <Key latin:keyLabel="र" - latin:moreKeys="ऋ,ऱ,ॠ" /> + latin:moreKeys="ऋ,ऱ,ॠ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0915: "क" DEVANAGARI LETTER KA U+0915/U+093C: "क़" DEVANAGARI LETTER KA/DEVANAGARI SIGN NUKTA --> <Key latin:keyLabel="क" - latin:moreKeys="क़" /> + latin:moreKeys="क़" + latin:keyLabelFlags="fontNormal" /> <!-- U+0924: "त" DEVANAGARI LETTER TA U+0924/U+094D/U+0930: "तà¥à¤°" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA --> <Key latin:keyLabel="त" - latin:moreKeys="त्र" /> + latin:moreKeys="त्र" + latin:keyLabelFlags="fontNormal" /> <!-- U+091A: "च" DEVANAGARI LETTER CA --> <Key - latin:keyLabel="च" /> + latin:keyLabel="च" + latin:keyLabelFlags="fontNormal" /> <!-- U+091F: "ट" DEVANAGARI LETTER TTA --> <Key - latin:keyLabel="ट" /> + latin:keyLabel="ट" + latin:keyLabelFlags="fontNormal" /> </default> </switch> </merge> diff --git a/java/res/xml/rowkeys_hindi3.xml b/java/res/xml/rowkeys_hindi3.xml index 92bcb56b35..ebbff3e333 100644 --- a/java/res/xml/rowkeys_hindi3.xml +++ b/java/res/xml/rowkeys_hindi3.xml @@ -27,15 +27,18 @@ > <!-- U+0911: "ऑ" DEVANAGARI LETTER CANDRA O --> <Key - latin:keyLabel="ऑ" /> + latin:keyLabel="ऑ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0901: "à¤" DEVANAGARI SIGN CANDRABINDU U+0945: "ॅ" DEVANAGARI VOWEL SIGN CANDRA E--> <Key latin:keyLabel="ँ" - latin:moreKeys="ॅ" /> + latin:moreKeys="ॅ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0923: "ण" DEVANAGARI LETTER NNA --> <Key - latin:keyLabel="ण" /> + latin:keyLabel="ण" + latin:keyLabelFlags="fontNormal" /> <!-- U+0929: "ऩ" DEVANAGARI LETTER NNNA --> <Key latin:keyLabel="ऩ" /> @@ -43,65 +46,79 @@ U+0934: "ऴ" DEVANAGARI LETTER LLLA --> <Key latin:keyLabel="ळ" - latin:moreKeys="ऴ" /> + latin:moreKeys="ऴ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0936: "श" DEVANAGARI LETTER SHA --> <Key - latin:keyLabel="श" /> + latin:keyLabel="श" + latin:keyLabelFlags="fontNormal" /> <!-- U+0937: "ष" DEVANAGARI LETTER SSA --> <Key - latin:keyLabel="ष" /> + latin:keyLabel="ष" + latin:keyLabelFlags="fontNormal" /> <!-- U+0943: "ृ" DEVANAGARI VOWEL SIGN VOCALIC R U+0944: "ॄ" DEVANAGARI VOWEL SIGN VOCALIC RR --> <Key latin:keyLabel="ृ" - latin:moreKeys="ॄ" /> + latin:moreKeys="ॄ" + latin:keyLabelFlags="fontNormal" /> <!-- U+091E: "ञ" DEVANAGARI LETTER NYA --> <Key - latin:keyLabel="ञ" /> + latin:keyLabel="ञ" + latin:keyLabelFlags="fontNormal" /> </case> <default> <!-- U+0949: "ॉ" DEVANAGARI VOWEL SIGN CANDRA O --> <Key - latin:keyLabel="ॉ" /> + latin:keyLabel="ॉ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0902: "ं" DEVANAGARI SIGN ANUSVARA --> <Key - latin:keyLabel="ं" /> + latin:keyLabel="ं" + latin:keyLabelFlags="fontNormal" /> <!-- U+092E: "म" DEVANAGARI LETTER MA U+0950: "à¥" DEVANAGARI OM --> <Key latin:keyLabel="म" - latin:moreKeys="ॐ" /> + latin:moreKeys="ॐ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0928: "न" DEVANAGARI LETTER NA U+091E: "ञ" DEVANAGARI LETTER NYA U+0919: "ङ" DEVANAGARI LETTER NGA U+0928/U+093C: "ऩ" DEVANAGARI LETTER NA/DEVANAGARI SIGN NUKTA --> <Key latin:keyLabel="न" - latin:moreKeys="ञ,ङ,ऩ" /> + latin:moreKeys="ञ,ङ,ऩ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0935: "व" DEVANAGARI LETTER VA --> <Key - latin:keyLabel="व" /> + latin:keyLabel="व" + latin:keyLabelFlags="fontNormal" /> <!-- U+0932: "ल" DEVANAGARI LETTER LA U+090C: "ऌ" DEVANAGARI LETTER VOCALIC L U+0961: "ॡ" DEVANAGARI LETTER VOCALIC LL --> <Key latin:keyLabel="ल" - latin:moreKeys="ऌ,ॡ" /> + latin:moreKeys="ऌ,ॡ" + latin:keyLabelFlags="fontNormal" /> <!-- U+0938: "स" DEVANAGARI LETTER SA --> <Key - latin:keyLabel="स" /> + latin:keyLabel="स" + latin:keyLabelFlags="fontNormal" /> <!-- U+092F: "य" DEVANAGARI LETTER YA U+095F: "य़" DEVANAGARI LETTER YYA --> <Key latin:keyLabel="य" - latin:moreKeys="य़" /> + latin:moreKeys="य़" + latin:keyLabelFlags="fontNormal" /> <!-- U+093C: "़" DEVANAGARI SIGN NUKTA U+097D: "ॽ" DEVANAGARI LETTER GLOTTAL STOP U+0970: "॰" DEVANAGARI ABBREVIATION SIGN U+093D: "ऽ" DEVANAGARI SIGN AVAGRAHA --> <Key latin:keyLabel="़" - latin:moreKeys="ॽ,॰,ऽ" /> + latin:moreKeys="ॽ,॰,ऽ" + latin:keyLabelFlags="fontNormal" /> </default> </switch> </merge> -- GitLab