Merge "Tweak 7 inch layout a bit"

main
Tadashi G. Takaoka 2012-03-12 21:01:56 -07:00 committed by Android (Google) Code Review
commit 041c3d3841
16 changed files with 62 additions and 88 deletions

View File

@ -32,7 +32,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@ -43,7 +42,6 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row

View File

@ -32,7 +32,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@ -43,7 +42,6 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row

View File

@ -24,31 +24,30 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.0%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_arabic1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.0%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_arabic2"
latin:keyXPos="3.0%p" />
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.0%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/key_smiley" />
latin:keyboardLayout="@xml/key_smiley"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_arabic3" />
</Row>

View File

@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@ -42,7 +41,6 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row

View File

@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.692%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian1"
@ -34,28 +34,28 @@
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.692%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian2"
latin:keyXPos="4.000%p" />
latin:keyXPos="4.500%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.692%p"
latin:keyWidth="7.6%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.000%p" />
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include

View File

@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.60%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic1"
@ -34,33 +34,32 @@
latin:keyLabel="&#x044A;" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.60%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic2"
latin:keyXPos="2.25%p" />
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.60%p"
latin:keyWidth="7.363%p"
>
<Key
latin:keyStyle="shiftKeyStyle" />
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth" />
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />

View File

@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@ -42,11 +41,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.9%p"
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
@ -57,8 +55,8 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth" />
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />

View File

@ -33,7 +33,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@ -44,11 +43,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.9%p"
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
@ -59,8 +57,8 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth" />
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />

View File

@ -24,7 +24,7 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="9.0%p"
latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/keys_apostrophe_dash" />
@ -32,29 +32,29 @@
latin:keyboardLayout="@xml/rowkeys_hebrew1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-12.000%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="9.0%p"
latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_hebrew2"
latin:keyXPos="4.5%p" />
</Row>
<Row
latin:keyWidth="8.9%p"
>
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_hebrew3" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-10.400%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.5%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_hebrew3"
latin:keyXPos="10.0%p" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.5%p"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />
</merge>

View File

@ -24,42 +24,38 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="7.9%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_nordic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.9%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_nordic2"
latin:keyXPos="3.5%p" />
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.9%p"
latin:keyWidth="7.6%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<Spacer
latin:keyWidth="4.35%p" />
<include
latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include

View File

@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@ -42,11 +41,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.9%p"
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
@ -57,8 +55,8 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth" />
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />

View File

@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@ -42,11 +41,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.9%p"
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
@ -57,8 +55,8 @@
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth" />
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />

View File

@ -24,41 +24,39 @@
<include
latin:keyboardLayout="@xml/key_styles_common" />
<Row
latin:keyWidth="8.0%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_south_slavic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.9%p"
latin:keyWidth="7.6%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_south_slavic2"
latin:keyXPos="2.15%p" />
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="7.5%p"
latin:keyWidth="7.363%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="8.0%p" />
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<include
latin:keyboardLayout="@xml/key_smiley"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth" />
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/row_qwerty4" />

View File

@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@ -42,7 +41,6 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row

View File

@ -32,7 +32,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@ -43,11 +42,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.9%p"
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="toMoreSymbolKeyStyle"
@ -55,7 +53,9 @@
<include
latin:keyboardLayout="@xml/rowkeys_symbols3" />
<Key
latin:keyLabel="/" />
latin:keyLabel="/"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row>
<include
latin:keyboardLayout="@xml/rows_symbols4" />

View File

@ -32,7 +32,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
@ -43,11 +42,10 @@
latin:keyXPos="4.5%p" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-14.6%p"
latin:keyWidth="fillBoth" />
</Row>
<Row
latin:keyWidth="8.9%p"
latin:keyWidth="9.0%p"
>
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"