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/key_colemak_colon.xml

diff --git a/java/res/xml/key_colemak_semicolon.xml b/java/res/xml/key_colemak_colon.xml
similarity index 100%
rename from java/res/xml/key_colemak_semicolon.xml
rename to java/res/xml/key_colemak_colon.xml

java/res/xml/key_space.xml

diff --git a/java/res/xml/key_space.xml b/java/res/xml/key_space.xml
index c47407d..02ee42f 100644
--- a/java/res/xml/key_space.xml
+++ b/java/res/xml/key_space.xml
@@ -21,9 +21,6 @@
 <merge
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
-    <Spacer
-        latin:keyWidth="0dp"
-        latin:keyXPos="25%p" />
     <switch>
         <case
             latin:languageCode="fa"

java/res/xml/row_dvorak4.xml

diff --git a/java/res/xml/row_dvorak4.xml b/java/res/xml/row_dvorak4.xml
index 7b9a59c..f81fb00 100644
--- a/java/res/xml/row_dvorak4.xml
+++ b/java/res/xml/row_dvorak4.xml
@@ -78,6 +78,7 @@
             </default>
         </switch>
         <include
+            latin:keyXPos="25%p"
             latin:keyboardLayout="@xml/key_space" />
         <Key
             latin:keyLabel="z"

java/res/xml/row_qwerty4.xml

diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml
index 361a2c3..6780349 100644
--- a/java/res/xml/row_qwerty4.xml
+++ b/java/res/xml/row_qwerty4.xml
@@ -30,6 +30,7 @@
         <include
             latin:keyboardLayout="@xml/key_f1" />
         <include
+            latin:keyXPos="25%p"
             latin:keyboardLayout="@xml/key_space" />
         <Key
             latin:keyStyle="punctuationKeyStyle" />

java/res/xml/row_symbols4.xml

diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml
index a92d55a..150ad48 100644
--- a/java/res/xml/row_symbols4.xml
+++ b/java/res/xml/row_symbols4.xml
@@ -44,6 +44,7 @@
             </default>
         </switch>
         <include
+            latin:keyXPos="25%p"
             latin:keyboardLayout="@xml/key_space" />
         <Key
             latin:keyStyle="punctuationKeyStyle" />

java/res/xml/row_symbols_shift4.xml

diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml
index 6608b77..1bfb5ec 100644
--- a/java/res/xml/row_symbols_shift4.xml
+++ b/java/res/xml/row_symbols_shift4.xml
@@ -36,6 +36,7 @@
             latin:keyLabel="„"
             latin:backgroundType="functional" />
         <include
+            latin:keyXPos="25%p"
             latin:keyboardLayout="@xml/key_space" />
         <!-- U+2026: "…" HORIZONTAL ELLIPSIS -->
         <Key

java/res/xml/rows_colemak.xml

diff --git a/java/res/xml/rows_colemak.xml b/java/res/xml/rows_colemak.xml
index a159965..d74c2c9 100644
--- a/java/res/xml/rows_colemak.xml
+++ b/java/res/xml/rows_colemak.xml
@@ -29,7 +29,7 @@
         <include
             latin:keyboardLayout="@xml/rowkeys_colemak1" />
         <include
-            latin:keyboardLayout="@xml/key_colemak_semicolon" />
+            latin:keyboardLayout="@xml/key_colemak_colon" />
     </Row>
     <Row
         latin:keyWidth="10%p"

java/res/xml/rows_number.xml

diff --git a/java/res/xml/rows_number.xml b/java/res/xml/rows_number.xml
index 8da83be..96564e8 100644
--- a/java/res/xml/rows_number.xml
+++ b/java/res/xml/rows_number.xml
@@ -20,7 +20,6 @@
 
 <merge
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="26.67%p"
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />