commit 260fce0a2cb9c47bc6065402bf35d13d80e3e64b
author Tadashi G. Takaoka <takaoka@google.com> Wed May 11 04:49:16 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 11 04:49:16 2011 -0700
tree 62223093d545efeffb67eb1d7057cfbb7aff97ae
parent 4ef1b6b6b6323e53d377ac78058466b74e48f555
parent 287d0d47ff9033cd198eebbbb0dbbc3a718c9994

Merge "Fix Serbian (Cyrillic) keyboard layout"

java/res/xml-xlarge/kbd_sr_rows.xml

diff --git a/java/res/xml-xlarge/kbd_sr_rows.xml b/java/res/xml-xlarge/kbd_sr_rows.xml
index ce9e208..be00585 100644
--- a/java/res/xml-xlarge/kbd_sr_rows.xml
+++ b/java/res/xml-xlarge/kbd_sr_rows.xml
@@ -30,7 +30,7 @@
         <Key
             latin:keyStyle="tabKeyStyle"
             latin:keyLabelOption="alignLeft"
-            latin:keyWidth="7.949%p"
+            latin:keyWidth="8.640%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="љ"
@@ -66,7 +66,7 @@
             latin:keyLabel="ш" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="9.331%p"
+            latin:keyWidth="8.640%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
@@ -75,7 +75,7 @@
         <Key
             latin:keyStyle="toSymbolKeyStyle"
             latin:keyLabelOption="alignLeft"
-            latin:keyWidth="7.949%p"
+            latin:keyWidth="8.640%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="а" />
@@ -101,7 +101,7 @@
             latin:keyLabel="ћ" />
         <Key
             latin:keyStyle="returnKeyStyle"
-            latin:keyWidth="9.331%p"
+            latin:keyWidth="8.640%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
@@ -109,12 +109,10 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="12.400%p"
+            latin:keyWidth="8.640%p"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="ђ" />
-        <Key
-            latin:keyLabel="ж" />
+            latin:keyLabel="ѕ" />
         <Key
             latin:keyLabel="џ" />
         <Key
@@ -128,6 +126,10 @@
         <Key
             latin:keyLabel="м" />
         <Key
+            latin:keyLabel="ђ" />
+        <Key
+            latin:keyLabel="ж" />
+        <Key
             latin:keyLabel=","
             latin:manualTemporaryUpperCaseCode="33"
             latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
@@ -141,7 +143,7 @@
             latin:popupCharacters="\?" />
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="12.400%p"
+            latin:keyWidth="8.640%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <include

java/res/xml/kbd_sr_rows.xml

diff --git a/java/res/xml/kbd_sr_rows.xml b/java/res/xml/kbd_sr_rows.xml
index 4a5ed11..8d6b070 100644
--- a/java/res/xml/kbd_sr_rows.xml
+++ b/java/res/xml/kbd_sr_rows.xml
@@ -73,7 +73,7 @@
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-        latin:keyWidth="8.333%p"
+        latin:keyWidth="9.09%p"
     >
         <Key
             latin:keyLabel="а"
@@ -97,20 +97,17 @@
         <Key
             latin:keyLabel="ч" />
         <Key
-            latin:keyLabel="ћ" />
-        <Key
-            latin:keyLabel="ђ"
+            latin:keyLabel="ћ"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-        latin:keyWidth="8.5%p"
+        latin:keyWidth="8.90%p"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="11.75%p"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="ж" />
+            latin:keyLabel="ѕ" />
         <Key
             latin:keyLabel="џ" />
         <Key
@@ -124,8 +121,12 @@
         <Key
             latin:keyLabel="м" />
         <Key
+            latin:keyLabel="ђ" />
+        <Key
+            latin:keyLabel="ж" />
+        <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="11.75%p"
+            latin:keyWidth="11.00%p"
             latin:keyEdgeFlags="right" />
     </Row>
     <include