am e6241e25: Merge "Tidy up Arabic and Farsi 7-inch layouts" into jb-dev

* commit 'e6241e2543b815efaa5b2a8cbc5b031f1307f500':
  Tidy up Arabic and Farsi 7-inch layouts
main
Tadashi G. Takaoka 2012-05-10 11:56:30 -07:00 committed by Android Git Automerger
commit 16a9e84201
2 changed files with 17 additions and 25 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_arabic1" /> latin:keyboardLayout="@xml/rowkeys_arabic1" />
@ -33,21 +33,20 @@
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_arabic2" latin:keyboardLayout="@xml/rowkeys_arabic2" />
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"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_arabic3" latin:keyboardLayout="@xml/rowkeys_arabic3"
latin:keyXPos="10.0%p" /> latin:keyXPos="7.727%p" />
</Row> </Row>
<include <include
latin:keyboardLayout="@xml/row_qwerty4" /> latin:keyboardLayout="@xml/row_qwerty4" />

View File

@ -24,39 +24,32 @@
<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_farsi1" /> latin:keyboardLayout="@xml/rowkeys_farsi1" />
</Row>
<Row
latin:keyWidth="7.727%p"
>
<include
latin:keyboardLayout="@xml/rowkeys_farsi2" />
<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_farsi2" latin:keyboardLayout="@xml/rowkeys_farsi3"
latin:keyXPos="4.5%p" /> latin:keyXPos="7.727%p" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row
latin:keyWidth="7.6%p"
>
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyWidth="10.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_farsi3" />
<include
latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-10.0%p"
latin:keyWidth="fillRight" />
</Row>
<include <include
latin:keyboardLayout="@xml/row_qwerty4" /> latin:keyboardLayout="@xml/row_qwerty4" />
</merge> </merge>