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

diff --git a/java/res/xml/rowkeys_arabic1.xml b/java/res/xml/rowkeys_arabic1.xml
index 266bba4..9f83fef 100644
--- a/java/res/xml/rowkeys_arabic1.xml
+++ b/java/res/xml/rowkeys_arabic1.xml
@@ -18,30 +18,25 @@
 */
 -->
 
-<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">
     <!-- U+0636: "ض" ARABIC LETTER DAD
          U+0661: "١" ARABIC-INDIC DIGIT ONE -->
     <Key
         latin:keySpec="&#x0636;"
         latin:keyHintLabel="1"
-        latin:additionalMoreKeys="1,&#x0661;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="1,&#x0661;" />
     <!-- U+0635: "ص" ARABIC LETTER SAD
          U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
     <Key
         latin:keySpec="&#x0635;"
         latin:keyHintLabel="2"
-        latin:additionalMoreKeys="2,&#x0662;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="2,&#x0662;" />
     <!-- U+062B: "ث" ARABIC LETTER THEH
          U+0663: "٣" ARABIC-INDIC DIGIT THREE -->
     <Key
         latin:keySpec="&#x062B;"
         latin:keyHintLabel="3"
-        latin:additionalMoreKeys="3,&#x0663;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="3,&#x0663;" />
     <!-- U+0642: "ق" ARABIC LETTER QAF
          U+0664: "٤" ARABIC-INDIC DIGIT FOUR
          U+06A8: "ڨ" ARABIC LETTER QAF WITH THREE DOTS ABOVE -->
@@ -50,8 +45,7 @@
         latin:keySpec="&#x0642;"
         latin:keyHintLabel="4"
         latin:additionalMoreKeys="4,&#x0664;"
-        latin:moreKeys="&#x06A8;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x06A8;" />
     <!-- U+0641: "ف" ARABIC LETTER FEH
          U+0665: "٥" ARABIC-INDIC DIGIT FIVE
          U+06A4: "ڤ" ARABIC LETTER VEH
@@ -63,22 +57,19 @@
         latin:keySpec="&#x0641;"
         latin:keyHintLabel="5"
         latin:additionalMoreKeys="5,&#x0665;"
-        latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x06A4;,&#x06A2;,&#x06A5;" />
     <!-- U+063A: "غ" ARABIC LETTER GHAIN
          U+0666: "٦" ARABIC-INDIC DIGIT SIX -->
     <Key
         latin:keySpec="&#x063A;"
         latin:keyHintLabel="6"
-        latin:additionalMoreKeys="6,&#x0666;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="6,&#x0666;" />
     <!-- U+0639: "ع" ARABIC LETTER AIN
          U+0667: "٧" ARABIC-INDIC DIGIT SEVEN -->
     <Key
         latin:keySpec="&#x0639;"
         latin:keyHintLabel="7"
-        latin:additionalMoreKeys="7,&#x0667;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="7,&#x0667;" />
     <!-- U+0647: "ه" ARABIC LETTER HEH
          U+0668: "٨" ARABIC-INDIC DIGIT EIGHT
          U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
@@ -87,26 +78,22 @@
         latin:keySpec="&#x0647;"
         latin:keyHintLabel="8"
         latin:additionalMoreKeys="8,&#x0668;"
-        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;" />
     <!-- U+062E: "خ" ARABIC LETTER KHAH
          U+0669: "٩" ARABIC-INDIC DIGIT NINE -->
     <Key
         latin:keySpec="&#x062E;"
         latin:keyHintLabel="9"
-        latin:additionalMoreKeys="9,&#x0669;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="9,&#x0669;" />
     <!-- U+062D: "ح" ARABIC LETTER HAH
          U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
     <Key
         latin:keySpec="&#x062D;"
         latin:keyHintLabel="0"
-        latin:additionalMoreKeys="0,&#x0660;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:additionalMoreKeys="0,&#x0660;" />
     <!-- U+062C: "ج" ARABIC LETTER JEEM
          U+0686: "چ" ARABIC LETTER TCHEH -->
     <Key
         latin:keySpec="&#x062C;"
-        latin:moreKeys="&#x0686;"
-        latin:keyLabelFlags="fontNormal" />
+        latin:moreKeys="&#x0686;" />
 </merge>