nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am a97bfdc2: Merge "Tidy up 10-9-7 7-inch tablet layouts" into jb-dev 

* commit 'a97bfdc225e5b9f7f73c0907c7a0f27ab5f08595':
  Tidy up 10-9-7 7-inch tablet layouts
main
Tadashi G. Takaoka 2012-05-10 11:56:24 -07:00 committed by Android Git Automerger
parent 7dc925bc9a a97bfdc225
commit bb984e1717
10 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/res/xml-sw600dp/key_space.xml
View File

@ -30,7 +30,7 @@
latin:keyStyle="languageSwitchKeyStyle" /> latin:keyStyle="languageSwitchKeyStyle" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="21.950%p" /> latin:keyWidth="25.50%p" />
<Key <Key
latin:keyStyle="zwnjKeyStyle" /> latin:keyStyle="zwnjKeyStyle" />
</case> </case>
@ -40,7 +40,7 @@
> >
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30.850%p" /> latin:keyWidth="34.00%p" />
<Key <Key
latin:keyStyle="zwnjKeyStyle" /> latin:keyStyle="zwnjKeyStyle" />
</case> </case>
@ -51,13 +51,13 @@
latin:keyStyle="languageSwitchKeyStyle" /> latin:keyStyle="languageSwitchKeyStyle" />
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="30.850%p" /> latin:keyWidth="34.00%p" />
</case> </case>
<!-- languageSwitchKeyEnabled="false" --> <!-- languageSwitchKeyEnabled="false" -->
<default> <default>
<Key <Key
latin:keyStyle="spaceKeyStyle" latin:keyStyle="spaceKeyStyle"
latin:keyWidth="39.750%p" /> latin:keyWidth="42.50%p" />
</default> </default>
</switch> </switch>
</merge> </merge>

8
java/res/xml-sw600dp/row_qwerty4.xml
View File

@ -22,22 +22,22 @@
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="30.750%p" latin:keyXPos="28.75%p"
latin:keyboardLayout="@xml/key_space" /> latin:keyboardLayout="@xml/key_space" />
<include <include
latin:keyboardLayout="@xml/key_apostrophe" /> latin:keyboardLayout="@xml/key_apostrophe" />
<include <include
latin:keyboardLayout="@xml/key_dash" /> latin:keyboardLayout="@xml/key_dash" />
<include <include
latin:keyXPos="-10.00%p" latin:keyXPos="-8.5%p"
latin:keyWidth="fillRight" latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" /> latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>

8
java/res/xml-sw600dp/row_symbols4.xml
View File

@ -22,17 +22,17 @@
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="toAlphaKeyStyle" latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="13.0%p" /> latin:keyWidth="11.75%p" />
<Key <Key
latin:keyStyle="smileyKeyStyle" /> latin:keyStyle="smileyKeyStyle" />
<Key <Key
latin:keyLabel="\@" /> latin:keyLabel="\@" />
<include <include
latin:keyXPos="30.750%p" latin:keyXPos="28.75%p"
latin:keyboardLayout="@xml/key_space" /> latin:keyboardLayout="@xml/key_space" />
<Key <Key
latin:keyLabel="&quot;" latin:keyLabel="&quot;"
@ -40,7 +40,7 @@
<Key <Key
latin:keyLabel="_" /> latin:keyLabel="_" />
<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>

8
java/res/xml-sw600dp/row_symbols_shift4.xml
View File

@ -22,18 +22,18 @@
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="toAlphaKeyStyle" latin:keyStyle="toAlphaKeyStyle"
latin:keyWidth="13.0%p" /> latin:keyWidth="11.75%p" />
<Key <Key
latin:keyStyle="smileyKeyStyle" /> latin:keyStyle="smileyKeyStyle" />
<include <include
latin:keyXPos="30.750%p" latin:keyXPos="28.75%p"
latin:keyboardLayout="@xml/key_space" /> latin:keyboardLayout="@xml/key_space" />
<include <include
latin:keyXPos="-10.00%p" latin:keyXPos="-8.5%p"
latin:keyWidth="fillRight" latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" /> latin:keyboardLayout="@xml/key_shortcut" />
</Row> </Row>

12
java/res/xml-sw600dp/rows_georgian.xml
View File

@ -24,7 +24,7 @@
<include <include
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_georgian1" latin:keyboardLayout="@xml/rowkeys_georgian1"
@ -34,28 +34,28 @@
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_georgian2" latin:keyboardLayout="@xml/rowkeys_georgian2"
latin:keyXPos="4.5%p" /> latin:keyXPos="5.875%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%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_georgian3" /> latin:keyboardLayout="@xml/rowkeys_georgian3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

12
java/res/xml-sw600dp/rows_greek.xml
View File

@ -24,7 +24,7 @@
<include <include
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/key_greek_semicolon" /> latin:keyboardLayout="@xml/key_greek_semicolon" />
@ -36,28 +36,28 @@
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_greek2" latin:keyboardLayout="@xml/rowkeys_greek2"
latin:keyXPos="4.5%p" /> latin:keyXPos="5.875%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%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_greek3" /> latin:keyboardLayout="@xml/rowkeys_greek3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

12
java/res/xml-sw600dp/rows_qwerty.xml
View File

@ -24,7 +24,7 @@
<include <include
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_qwerty1" latin:keyboardLayout="@xml/rowkeys_qwerty1"
@ -34,28 +34,28 @@
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_qwerty2" latin:keyboardLayout="@xml/rowkeys_qwerty2"
latin:keyXPos="4.5%p" /> latin:keyXPos="5.875%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%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_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="-9.0%p" latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

12
java/res/xml-sw600dp/rows_qwertz.xml
View File

@ -24,7 +24,7 @@
<include <include
latin:keyboardLayout="@xml/key_styles_common" /> latin:keyboardLayout="@xml/key_styles_common" />
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_qwertz1" latin:keyboardLayout="@xml/rowkeys_qwertz1"
@ -34,28 +34,28 @@
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_qwerty2" latin:keyboardLayout="@xml/rowkeys_qwerty2"
latin:keyXPos="4.5%p" /> latin:keyXPos="5.875%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%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_qwertz3" /> latin:keyboardLayout="@xml/rowkeys_qwertz3" />
<include <include
latin:keyboardLayout="@xml/keys_comma_period" /> latin:keyboardLayout="@xml/keys_comma_period" />
<Key <Key
latin:keyStyle="shiftKeyStyle" latin:keyStyle="shiftKeyStyle"
latin:keyXPos="-9.0%p" latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

14
java/res/xml-sw600dp/rows_symbols.xml
View File

@ -26,7 +26,7 @@
<include <include
latin:keyboardLayout="@xml/key_styles_currency" /> latin:keyboardLayout="@xml/key_styles_currency" />
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_symbols1" /> latin:keyboardLayout="@xml/rowkeys_symbols1" />
@ -35,26 +35,26 @@
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_symbols2" latin:keyboardLayout="@xml/rowkeys_symbols2"
latin:keyXPos="4.5%p" /> latin:keyXPos="5.875%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<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="-9.0%p" latin:keyXPos="-11.75%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<include <include

14
java/res/xml-sw600dp/rows_symbols_shift.xml
View File

@ -26,7 +26,7 @@
<include <include
latin:keyboardLayout="@xml/key_styles_currency" /> latin:keyboardLayout="@xml/key_styles_currency" />
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<include <include
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" /> latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
@ -35,23 +35,27 @@
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%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" /> latin:keyXPos="5.875%p" />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillBoth" /> latin:keyWidth="fillBoth" />
</Row> </Row>
<Row <Row
latin:keyWidth="9.0%p" latin:keyWidth="8.5%p"
> >
<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" />