am 3b7d40f4: Merge "Tidy up 10-10-7 7-inch tablet layouts" into jb-dev

* commit '3b7d40f4643b9a6a6cb979e9493f56197bd89fc0':
  Tidy up 10-10-7 7-inch tablet layouts
main
Tadashi G. Takaoka 2012-05-10 11:56:26 -07:00 committed by Android Git Automerger
commit 00639648d4
8 changed files with 28 additions and 30 deletions

View File

@ -22,19 +22,20 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
> >
<Row <Row
latin:keyWidth="8.9%p" latin:keyWidth="8.5%p"
> >
<Key <Key
latin:keyStyle="toSymbolKeyStyle" latin:keyStyle="toSymbolKeyStyle"
latin:keyWidth="13.0%p" /> latin:keyWidth="11.75%p" />
<include <include
latin:keyboardLayout="@xml/keys_f1f2" /> latin:keyboardLayout="@xml/keys_f1f2" />
<include <include
latin:keyXPos="28.75%p"
latin:keyboardLayout="@xml/key_space" /> latin:keyboardLayout="@xml/key_space" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<include <include
latin:keyXPos="-10.0%p" latin:keyXPos="-8.5%p"
latin:keyWidth="fillRight" latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" /> latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>

View File

@ -38,8 +38,7 @@
latin:keyWidth="8.5%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_symbols2" latin:keyboardLayout="@xml/rowkeys_symbols2" />
latin:keyXPos="4.5%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
@ -49,12 +48,12 @@
> >
<Key <Key
latin:keyStyle="toMoreSymbolKeyStyle" latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="11.75%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_symbols3" /> latin:keyboardLayout="@xml/rowkeys_symbols3" />
<Key <Key
latin:keyLabel="/" latin:keyStyle="toMoreSymbolKeyStyle"
latin:keyXPos="-8.5%p" latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -38,8 +38,7 @@
latin:keyWidth="8.5%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_symbols_shift2" latin:keyboardLayout="@xml/rowkeys_symbols_shift2" />
latin:keyXPos="4.5%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
@ -49,9 +48,13 @@
> >
<Key <Key
latin:keyStyle="backFromMoreSymbolKeyStyle" latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="11.75%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_symbols_shift3" /> latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
<Key
latin:keyStyle="backFromMoreSymbolKeyStyle"
latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/row_symbols_shift4" /> latin:keyboardLayout="@xml/row_symbols_shift4" />

View File

@ -37,8 +37,7 @@
latin:keyWidth="8.5%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_azerty2" latin:keyboardLayout="@xml/rowkeys_azerty2" />
latin:keyXPos="4.5%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
@ -48,14 +47,14 @@
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="11.75%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_azerty3" /> latin:keyboardLayout="@xml/rowkeys_azerty3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -39,8 +39,7 @@
latin:keyWidth="8.5%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_colemak2" latin:keyboardLayout="@xml/rowkeys_colemak2" />
latin:keyXPos="4.5%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
@ -50,14 +49,14 @@
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="11.75%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_colemak3" /> latin:keyboardLayout="@xml/rowkeys_colemak3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -39,8 +39,7 @@
latin:keyWidth="8.5%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_dvorak2" latin:keyboardLayout="@xml/rowkeys_dvorak2" />
latin:keyXPos="4.5%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
@ -50,12 +49,12 @@
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="11.75%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_dvorak3" /> latin:keyboardLayout="@xml/rowkeys_dvorak3" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

View File

@ -40,8 +40,7 @@
latin:keyWidth="8.5%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_hebrew2" latin:keyboardLayout="@xml/rowkeys_hebrew2" />
latin:keyXPos="4.5%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
@ -51,7 +50,7 @@
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_hebrew3" latin:keyboardLayout="@xml/rowkeys_hebrew3"
latin:keyXPos="10.0%p" /> latin:keyXPos="11.75%p" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/row_hebrew4" /> latin:keyboardLayout="@xml/row_hebrew4" />

View File

@ -37,8 +37,7 @@
latin:keyWidth="8.5%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_spanish2" latin:keyboardLayout="@xml/rowkeys_spanish2" />
latin:keyXPos="4.5%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
@ -48,14 +47,14 @@
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="11.75%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_qwerty3" /> latin:keyboardLayout="@xml/rowkeys_qwerty3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-10.0%p" latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include