commit 92ac2aa8ed3ad889f5a31336900e3c46264df97d
author Tadashi G. Takaoka <takaoka@google.com> Mon Jul 07 16:33:06 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Mon Jul 07 18:58:01 2014 +0900
tree 9cc9e15d895065c67cac7c1c566e59f57d430a59
parent b1807d0bc75fd4191a9cd45c03a777ee8e650686

Move fontNormal flag from Key to Row

Change-Id: I250da7c82e005ffe2027c528a1df731a1a3cdf47

java/res/xml/rowkeys_hindi2.xml

diff --git a/java/res/xml/rowkeys_hindi2.xml b/java/res/xml/rowkeys_hindi2.xml
index 7ba4ee1..fec93f3 100644
--- a/java/res/xml/rowkeys_hindi2.xml
+++ b/java/res/xml/rowkeys_hindi2.xml
@@ -18,21 +18,16 @@
 */
 -->
 
-<merge
-    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
+<merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin">
     <switch>
-        <case
-            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted"
-        >
+        <case latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted">
             <!-- U+0913: "ओ" DEVANAGARI LETTER O
                  U+0913/U+0902: "ओं" DEVANAGARI LETTER O/DEVANAGARI SIGN ANUSVARA
                  U+0911: "ऑ" DEVANAGARI LETTER CANDRA O
                  U+0912: "ऒ" DEVANAGARI LETTER SHORT O -->
             <Key
                 latin:keySpec="&#x0913;"
-                latin:moreKeys="&#x0913;&#x0902;,&#x0911;,&#x0912;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0913;&#x0902;,&#x0911;,&#x0912;" />
             <!-- U+090F: "ए" DEVANAGARI LETTER E
                  U+090F/U+0902: "एं" DEVANAGARI LETTER E/DEVANAGARI SIGN ANUSVARA
                  U+090F/U+0901: "एँ" DEVANAGARI LETTER E/DEVANAGARI SIGN CANDRABINDU
@@ -40,129 +35,97 @@
                  U+090E: "ऎ" DEVANAGARI LETTER SHORT E -->
             <Key
                 latin:keySpec="&#x090F;"
-                latin:moreKeys="&#x090F;&#x0902;,&#x090F;&#x0901;,&#x090D;,&#x090E;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x090F;&#x0902;,&#x090F;&#x0901;,&#x090D;,&#x090E;" />
             <!-- U+0905: "अ" DEVANAGARI LETTER A
                  U+0905/U+0902: "अं" DEVANAGARI LETTER A/DEVANAGARI SIGN ANUSVARA
                  U+0905/U+0901: "अँ" DEVANAGARI LETTER A/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0905;"
-                latin:moreKeys="&#x0905;&#x0902;,&#x0905;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0905;&#x0902;,&#x0905;&#x0901;" />
             <!-- U+0907: "इ" DEVANAGARI LETTER I
                  U+0907/U+0902: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN ANUSVARA
                  U+0907/U+0901: "इं" DEVANAGARI LETTER I/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0907;"
-                latin:moreKeys="&#x0907;&#x0902;,&#x0907;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0907;&#x0902;,&#x0907;&#x0901;" />
             <!-- U+0909: "उ" DEVANAGARI LETTER U
                  U+0909/U+0902: "उं" DEVANAGARI LETTER U/DEVANAGARI SIGN ANUSVARA
                  U+0909/U+0901: "उँ" DEVANAGARI LETTER U/DEVANAGARI SIGN CANDRABINDU -->
             <Key
                 latin:keySpec="&#x0909;"
-                latin:moreKeys="&#x0909;&#x0902;,&#x0909;&#x0901;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0909;&#x0902;,&#x0909;&#x0901;" />
             <!-- U+092B: "फ" DEVANAGARI LETTER PHA
                  U+092B/U+093C: "फ़" DEVANAGARI LETTER PHA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x092B;"
-                latin:moreKeys="&#x092B;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x092B;&#x093C;" />
             <!-- U+0931: "ऱ" DEVANAGARI LETTER RRA
                  U+094D/U+0930: "्र" DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA
                  U+0930/U+094D: "र्" DEVANAGARI LETTER RA/DEVANAGARI SIGN VIRAMA -->
             <Key
                 latin:keySpec="&#x0931;"
-                latin:moreKeys="&#x094D;&#x0930;,&#x0930;&#x094D;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x094D;&#x0930;,&#x0930;&#x094D;" />
             <!-- U+0916: "ख" DEVANAGARI LETTER KHA
                  U+0916/U+093C: "ख़" DEVANAGARI LETTER KHA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x0916;"
-                latin:moreKeys="&#x0916;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0916;&#x093C;" />
             <!-- U+0925: "थ" DEVANAGARI LETTER THA -->
-            <Key
-                latin:keySpec="&#x0925;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0925;" />
             <!-- U+091B: "छ" DEVANAGARI LETTER CHA -->
-            <Key
-                latin:keySpec="&#x091B;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091B;" />
             <!-- U+0920: "ठ" DEVANAGARI LETTER TTHA -->
-            <Key
-                latin:keySpec="&#x0920;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x0920;" />
         </case>
         <default>
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignO" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_o" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignO" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignE" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_e" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignE" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariSignVirama" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_sign_virama" />
+            <Key latin:keyStyle="baseKeyDevanagariSignVirama" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignI" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_i" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignI" />
             <!-- Because the font rendering system prior to API version 16 can't automatically
                  render dotted circle for incomplete combining letter of some scripts, different
                  set of Key definitions are needed based on the API version. -->
-            <include
-                latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
-            <Key
-                latin:keyStyle="baseKeyDevanagariVowelSignU" />
+            <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_u" />
+            <Key latin:keyStyle="baseKeyDevanagariVowelSignU" />
             <!-- U+092A: "प" DEVANAGARI LETTER PA -->
-            <Key
-                latin:keySpec="&#x092A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x092A;" />
             <!-- U+0930: "र" DEVANAGARI LETTER RA
                  U+090B: "ऋ" DEVANAGARI LETTER VOCALIC R
                  U+0930/U+093C: "ऱ" DEVANAGARI LETTER RA/DEVANAGARI SIGN NUKTA
                  U+0960: "ॠ" DEVANAGARI LETTER VOCALIC RR -->
             <Key
                 latin:keySpec="&#x0930;"
-                latin:moreKeys="&#x090B;,&#x0930;&#x093C;,&#x0960;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x090B;,&#x0930;&#x093C;,&#x0960;" />
             <!-- U+0915: "क" DEVANAGARI LETTER KA
                  U+0915/U+093C: "क़" DEVANAGARI LETTER KA/DEVANAGARI SIGN NUKTA -->
             <Key
                 latin:keySpec="&#x0915;"
-                latin:moreKeys="&#x0915;&#x093C;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0915;&#x093C;" />
             <!-- U+0924: "त" DEVANAGARI LETTER TA
                  U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
             <Key
                 latin:keySpec="&#x0924;"
-                latin:moreKeys="&#x0924;&#x094D;&#x0930;"
-                latin:keyLabelFlags="fontNormal" />
+                latin:moreKeys="&#x0924;&#x094D;&#x0930;" />
             <!-- U+091A: "च" DEVANAGARI LETTER CA -->
-            <Key
-                latin:keySpec="&#x091A;"
-                latin:keyLabelFlags="fontNormal" />
+            <Key latin:keySpec="&#x091A;" />
             <!-- U+091F: "ट" DEVANAGARI LETTER TTA -->
-            <Key
-                latin:keySpec="&#x091F;"
-                latin:keyLabelFlags="fontNormal" />
-         </default>
+            <Key latin:keySpec="&#x091F;" />
+        </default>
     </switch>
 </merge>