Merge "Tidy up 11-11-{7,8,9} 7-inch tablet layouts" into jb-dev

main
Tadashi G. Takaoka 2012-05-10 02:54:14 -07:00 committed by Android (Google) Code Review
commit c44a3e07a3
4 changed files with 24 additions and 37 deletions

View File

@ -24,7 +24,7 @@
<include <include
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row <Row
latin:keyWidth="7.6%p" latin:keyWidth="7.727%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_bulgarian1" latin:keyboardLayout="@xml/rowkeys_bulgarian1"
@ -34,28 +34,27 @@
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="7.6%p" latin:keyWidth="7.727%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_bulgarian2" latin:keyboardLayout="@xml/rowkeys_bulgarian2" />
latin:keyXPos="4.500%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="7.6%p" latin:keyWidth="7.65%p"
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="11.75%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_bulgarian3" /> latin:keyboardLayout="@xml/rowkeys_bulgarian3" />
<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

@ -24,42 +24,34 @@
<include <include
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row <Row
latin:keyWidth="7.6%p" latin:keyWidth="7.727%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_east_slavic1" latin:keyboardLayout="@xml/rowkeys_east_slavic1"
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" /> latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<Key
latin:keyLabel="&#x044A;" />
<Key <Key
latin:keyStyle="deleteKeyStyle" latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="7.6%p" latin:keyWidth="7.727%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_east_slavic2" latin:keyboardLayout="@xml/rowkeys_east_slavic2" />
latin:keyXPos="4.5%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="7.363%p" latin:keyWidth="7.727%p"
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="11.75%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_east_slavic3" /> latin:keyboardLayout="@xml/rowkeys_east_slavic3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/row_qwerty4" /> latin:keyboardLayout="@xml/row_qwerty4" />

View File

@ -24,7 +24,7 @@
<include <include
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row <Row
latin:keyWidth="7.6%p" latin:keyWidth="7.727%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_nordic1" latin:keyboardLayout="@xml/rowkeys_nordic1"
@ -34,28 +34,29 @@
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="7.6%p" latin:keyWidth="7.727%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_nordic2" latin:keyboardLayout="@xml/rowkeys_nordic2" />
latin:keyXPos="4.5%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="7.6%p" latin:keyWidth="7.727%p"
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="11.75%p" />
<Spacer
latin:keyWidth="3.479%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

View File

@ -24,7 +24,7 @@
<include <include
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row <Row
latin:keyWidth="7.6%p" latin:keyWidth="7.727%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_south_slavic1" latin:keyboardLayout="@xml/rowkeys_south_slavic1"
@ -34,29 +34,24 @@
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="7.6%p" latin:keyWidth="7.727%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_south_slavic2" latin:keyboardLayout="@xml/rowkeys_south_slavic2" />
latin:keyXPos="4.5%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="7.363%p" latin:keyWidth="7.727%p"
> >
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" /> latin:keyWidth="11.75%p" />
<include <include
latin:keyboardLayout="@xml/rowkeys_south_slavic3" /> latin:keyboardLayout="@xml/rowkeys_south_slavic3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p"
latin:keyWidth="fillRight" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/row_qwerty4" /> latin:keyboardLayout="@xml/row_qwerty4" />