Skip to content
Snippets Groups Projects
Commit c04075b1 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

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
parent 9a7cdb20
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 45 additions and 65 deletions
java/res/xml-sw600dp/key_f1.xml
+ 1
− 7
View file @ c04075b1
......@@ -23,13 +23,7 @@
>
<switch>
<case
latin:mode="email"
>
<Key
latin:keyStyle="comKeyStyle" />
</case>
<case
latin:mode="url"
latin:mode="email|url"
>
<Key
latin:keyStyle="comKeyStyle" />
......
java/res/xml-sw600dp/key_shortcut.xml
+ 3
− 6
View file @ c04075b1
......@@ -29,24 +29,21 @@
<Key
latin:keyStyle="shortcutKeyStyle"
latin:keyLabelFlags="hasPopupHint|preserveCase"
latin:moreKeys="!text/settings_as_more_key"
latin:keyWidth="fillBoth" />
latin:moreKeys="!text/settings_as_more_key" />
</case>
<case
latin:shortcutKeyEnabled="true"
latin:clobberSettingsKey="true"
>
<Key
latin:keyStyle="shortcutKeyStyle"
latin:keyWidth="fillBoth" />
latin:keyStyle="shortcutKeyStyle" />
</case>
<case
latin:shortcutKeyEnabled="false"
latin:clobberSettingsKey="false"
>
<Key
latin:keyStyle="settingsKeyStyle"
latin:keyWidth="fillBoth" />
latin:keyStyle="settingsKeyStyle" />
</case>
<!-- shortcutKeyEnabled="false" clobberSettingsKey="true" -->
<default>
......
java/res/xml-sw600dp/key_space.xml
+ 0
− 3
View file @ c04075b1
......@@ -21,9 +21,6 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Spacer
latin:keyWidth="0dp"
latin:keyXPos="30.750%p" />
<switch>
<case
latin:languageCode="fa"
......
java/res/xml-sw600dp/row_dvorak4.xml
+ 3
− 3
View file @ c04075b1
......@@ -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_question_exclamation" />
<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>
java/res/xml-sw600dp/row_hebrew4.xml
+ 2
− 3
View file @ c04075b1
......@@ -35,10 +35,9 @@
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Spacer
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
java/res/xml-sw600dp/row_qwerty4.xml
+ 3
− 3
View file @ c04075b1
......@@ -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>
java/res/xml-sw600dp/row_symbols4.xml
+ 3
− 3
View file @ c04075b1
......@@ -32,16 +32,16 @@
<Key
latin:keyLabel="\@" />
<include
latin:keyXPos="30.750%p"
latin:keyboardLayout="@xml/key_space" />
<Key
latin:keyLabel="&quot;"
latin:moreKeys="!text/more_keys_for_tablet_double_quote" />
<Key
latin:keyLabel="_" />
<Spacer
latin:keyXPos="-10.00%p"
latin:keyWidth="0%p" />
<include
latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
java/res/xml-sw600dp/row_symbols_shift4.xml
+ 3
− 3
View file @ c04075b1
......@@ -30,11 +30,11 @@
<Key
latin:keyStyle="tabKeyStyle" />
<include
latin:keyXPos="30.750%p"
latin:keyboardLayout="@xml/key_space" />
<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>
java/res/xml-sw600dp/rows_colemak.xml
+ 1
− 1
View file @ c04075b1
......@@ -30,7 +30,7 @@
latin:keyboardLayout="@xml/rowkeys_colemak1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<include
latin:keyboardLayout="@xml/key_colemak_semicolon" />
latin:keyboardLayout="@xml/key_colemak_colon" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillBoth" />
......
java/res/xml-sw600dp/rows_hindi.xml
+ 4
− 2
View file @ c04075b1
......@@ -38,7 +38,7 @@
>
<include
latin:keyboardLayout="@xml/rowkeys_hindi2"
latin:keyXPos="4.500%p" />
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
......@@ -54,7 +54,9 @@
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley" />
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-7.5%p"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
......
java/res/xml-sw600dp/rows_nordic.xml
+ 1
− 1
View file @ c04075b1
......@@ -55,7 +55,7 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-9.0%p"
latin:keyXPos="-7.6%p"
latin:keyWidth="fillRight" />
</Row>
<include
......
java/res/xml-sw600dp/rows_number_normal.xml
+ 3
− 5
View file @ c04075b1
......@@ -135,8 +135,7 @@
latin:keyLabel="9"
latin:keyStyle="numKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="0%p" />
<Spacer />
</Row>
<Row>
<Key
......@@ -155,10 +154,9 @@
<Key
latin:keyLabel="#"
latin:keyStyle="numKeyStyle" />
<Spacer
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
<include
latin:keyXPos="-11.0%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
java/res/xml-sw600dp/rows_number_password.xml
+ 3
− 5
View file @ c04075b1
......@@ -62,8 +62,7 @@
<Key
latin:keyStyle="num9KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="0%p" />
<Spacer />
</Row>
<Row>
<Key
......@@ -72,10 +71,9 @@
<Key
latin:keyStyle="num0KeyStyle"
latin:keyXPos="42.50%p"/>
<Spacer
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
<include
latin:keyXPos="-11.00%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
java/res/xml-sw600dp/rows_phone.xml
+ 3
− 5
View file @ c04075b1
......@@ -104,8 +104,7 @@
<Key
latin:keyStyle="num9KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="0%p" />
<Spacer />
</Row>
<Row>
<Key
......@@ -123,10 +122,9 @@
<Key
latin:keyLabel="#"
latin:keyStyle="numKeyStyle" />
<Spacer
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
<include
latin:keyXPos="-11.0%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
java/res/xml-sw768dp/key_shortcut.xml
+ 1
− 3
View file @ c04075b1
......@@ -26,9 +26,7 @@
latin:shortcutKeyEnabled="true"
>
<Key
latin:keyStyle="shortcutKeyStyle"
latin:keyXPos="-8.047%p"
latin:keyWidth="fillRight" />
latin:keyStyle="shortcutKeyStyle" />
</case>
</switch>
</merge>
java/res/xml-sw768dp/key_space.xml
+ 0
− 3
View file @ c04075b1
......@@ -21,9 +21,6 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Spacer
latin:keyWidth="0dp"
latin:keyXPos="31.250%p" />
<switch>
<case
latin:languageCode="fa"
......
java/res/xml-sw768dp/row_dvorak4.xml
+ 4
− 3
View file @ c04075b1
......@@ -26,18 +26,19 @@
>
<include
latin:keyboardLayout="@xml/key_settings" />
<Spacer
latin:keyXPos="15.157%p"
latin:keyWidth="0%p" />
<include
latin:keyXPos="15.157%p"
latin:keyboardLayout="@xml/keys_f1f2" />
<include
latin:keyXPos="31.250%p"
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/key_question_exclamation" />
<include
latin:keyboardLayout="@xml/key_dash" />
<include
latin:keyXPos="-8.047%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
java/res/xml-sw768dp/row_hebrew4.xml
+ 3
− 3
View file @ c04075b1
......@@ -26,16 +26,16 @@
>
<include
latin:keyboardLayout="@xml/key_settings" />
<Spacer
latin:keyXPos="15.157%p"
latin:keyWidth="0%p" />
<include
latin:keyXPos="15.157%p"
latin:keyboardLayout="@xml/keys_f1f2" />
<include
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyXPos="-8.047%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
java/res/xml-sw768dp/row_qwerty4.xml
+ 4
− 3
View file @ c04075b1
......@@ -26,18 +26,19 @@
>
<include
latin:keyboardLayout="@xml/key_settings" />
<Spacer
latin:keyXPos="15.157%p"
latin:keyWidth="0%p" />
<include
latin:keyXPos="15.157%p"
latin:keyboardLayout="@xml/keys_f1f2" />
<include
latin:keyXPos="31.250%p"
latin:keyboardLayout="@xml/key_space" />
<include
latin:keyboardLayout="@xml/key_apostrophe" />
<include
latin:keyboardLayout="@xml/key_dash" />
<include
latin:keyXPos="-8.047%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
</Row>
</merge>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment