commit c04075b1385cd362b3ecb48c8fa0e4d1f40a9b9a
author Tadashi G. Takaoka <takaoka@google.com> Mon Apr 23 15:33:59 2012 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue Apr 24 01:47:03 2012 +0900
tree bd62495a6c893684a144392a419f71fe83a873b8
parent 9a7cdb2051ad7b73dcd5c49655bef5914f60cda1

Cleanup <include/> and etc. in keyboard XML

* Remove keyXPos and keyWidth from key_*.xml and make it more generic.
* Add keyXPos and keyWidth to <include/> generalized key_*.xml.
* Remove zero width <Spacer/> and fold into successive <include/>.

Change-Id: I4b5c02a165ba0bc9ef8741be0b4938c1efaf5e27

java/res/xml-sw600dp/row_qwerty4.xml

diff --git a/java/res/xml-sw600dp/row_qwerty4.xml b/java/res/xml-sw600dp/row_qwerty4.xml
index 58610ae..76ac3a0 100644
--- a/java/res/xml-sw600dp/row_qwerty4.xml
+++ b/java/res/xml-sw600dp/row_qwerty4.xml
@@ -32,15 +32,15 @@
         <include
             latin:keyboardLayout="@xml/key_f1" />
         <include
+            latin:keyXPos="30.750%p"
             latin:keyboardLayout="@xml/key_space" />
         <include
             latin:keyboardLayout="@xml/key_apostrophe" />
         <include
             latin:keyboardLayout="@xml/key_dash" />
-        <Spacer
-            latin:keyXPos="-10.00%p"
-            latin:keyWidth="0%p" />
         <include
+            latin:keyXPos="-10.00%p"
+            latin:keyWidth="fillRight"
             latin:keyboardLayout="@xml/key_shortcut" />
     </Row>
 </merge>