diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-23 15:33:59 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-04-24 01:47:03 +0900 |
| commit | c04075b1385cd362b3ecb48c8fa0e4d1f40a9b9a (patch) | |
| tree | bd62495a6c893684a144392a419f71fe83a873b8 /java/res/xml | |
| parent | 9a7cdb2051ad7b73dcd5c49655bef5914f60cda1 (diff) | |
| download | latinime-c04075b1385cd362b3ecb48c8fa0e4d1f40a9b9a.tar.gz latinime-c04075b1385cd362b3ecb48c8fa0e4d1f40a9b9a.tar.xz latinime-c04075b1385cd362b3ecb48c8fa0e4d1f40a9b9a.zip | |
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
Diffstat (limited to 'java/res/xml')
| -rw-r--r-- | java/res/xml/key_colemak_colon.xml (renamed from java/res/xml/key_colemak_semicolon.xml) | 0 | ||||
| -rw-r--r-- | java/res/xml/key_space.xml | 3 | ||||
| -rw-r--r-- | java/res/xml/row_dvorak4.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/row_qwerty4.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/row_symbols4.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/row_symbols_shift4.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/rows_colemak.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/rows_number.xml | 1 |
8 files changed, 5 insertions, 5 deletions
diff --git a/java/res/xml/key_colemak_semicolon.xml b/java/res/xml/key_colemak_colon.xml index 307b4ebca..307b4ebca 100644 --- a/java/res/xml/key_colemak_semicolon.xml +++ b/java/res/xml/key_colemak_colon.xml diff --git a/java/res/xml/key_space.xml b/java/res/xml/key_space.xml index c47407dc7..02ee42fd2 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" diff --git a/java/res/xml/row_dvorak4.xml b/java/res/xml/row_dvorak4.xml index 7b9a59cde..f81fb007b 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" diff --git a/java/res/xml/row_qwerty4.xml b/java/res/xml/row_qwerty4.xml index 361a2c3ef..678034960 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" /> diff --git a/java/res/xml/row_symbols4.xml b/java/res/xml/row_symbols4.xml index a92d55a76..150ad486c 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" /> diff --git a/java/res/xml/row_symbols_shift4.xml b/java/res/xml/row_symbols_shift4.xml index 6608b7795..1bfb5ecd1 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 diff --git a/java/res/xml/rows_colemak.xml b/java/res/xml/rows_colemak.xml index a1599650d..d74c2c9ec 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" diff --git a/java/res/xml/rows_number.xml b/java/res/xml/rows_number.xml index 8da83be80..96564e8ff 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" /> |