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_marathi2.xml

diff --git a/java/res/xml/rowkeys_marathi2.xml b/java/res/xml/rowkeys_marathi2.xml
index f950915..060822e 100644
--- a/java/res/xml/rowkeys_marathi2.xml
+++ b/java/res/xml/rowkeys_marathi2.xml
@@ -18,83 +18,64 @@
 */
 -->
 
-<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">
     <!-- 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
          U+092B: "फ" DEVANAGARI LETTER PHA -->
     <Key
         latin:keySpec="&#x092A;"
-        latin:moreKeys="&#x092B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x092B;" />
     <!-- 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_vocalic_r" />
+    <include latin:keyboardLayout="@xml/keystyle_devanagari_vowel_sign_vocalic_r" />
     <!-- U+0930: "र" DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0930;"
-        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR"
-        latin:keyLabelFlags="fontNormal" />
+        latin:keyStyle="moreKeysDevanagariVowelSignVocalicR" />
     <!-- U+0915: "क" DEVANAGARI LETTER KA
          U+0916: "ख" DEVANAGARI LETTER KHA -->
     <Key
         latin:keySpec="&#x0915;"
-        latin:moreKeys="&#x0916;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0916;" />
     <!-- U+0924: "त" DEVANAGARI LETTER TA
          U+0925: "थ" DEVANAGARI LETTER THA
          U+0924/U+094D/U+0930: "त्र" DEVANAGARI LETTER TA/DEVANAGARI SIGN VIRAMA/DEVANAGARI LETTER RA -->
     <Key
         latin:keySpec="&#x0924;"
-        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0925;,&#x0924;&#x094D;&#x0930;" />
     <!-- U+091A: "च" DEVANAGARI LETTER CA
          U+091B: "छ" DEVANAGARI LETTER CHA -->
     <Key
         latin:keySpec="&#x091A;"
-        latin:moreKeys="&#x091B;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x091B;" />
     <!-- U+091F: "ट" DEVANAGARI LETTER TTA
          U+0920: "ठ" DEVANAGARI LETTER TTHA -->
     <Key
         latin:keySpec="&#x091F;"
-        latin:moreKeys="&#x0920;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0920;" />
 </merge>