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

Merge "Tidy up number password layout" into jb-dev

main
Tadashi G. Takaoka 2012-05-17 00:58:15 -07:00 committed by Android (Google) Code Review
parent eca2912a99 6de535c35e
commit a1500959b6
2 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
java/res/xml-sw600dp/rows_number_password.xml
View File

@ -31,9 +31,8 @@
latin:keyStyle="num2KeyStyle" /> latin:keyStyle="num2KeyStyle" />
<Key <Key
latin:keyStyle="num3KeyStyle" /> latin:keyStyle="num3KeyStyle" />
<Key <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
latin:keyStyle="deleteKeyStyle" <Spacer
latin:keyXPos="-16%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
@ -46,9 +45,8 @@
latin:keyStyle="num5KeyStyle" /> latin:keyStyle="num5KeyStyle" />
<Key <Key
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Key <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
latin:keyStyle="enterKeyStyle" <Spacer
latin:keyXPos="-16%p"
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
@ -62,17 +60,21 @@
<Key <Key
latin:keyStyle="num9KeyStyle" /> latin:keyStyle="num9KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. --> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer /> <Spacer
latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. --> <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer <Spacer
latin:keyWidth="41%p" /> latin:keyWidth="23%p" />
<Key
latin:keyStyle="deleteKeyStyle" />
<Key <Key
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<include <Key
latin:keyXPos="-10%p" latin:keyStyle="enterKeyStyle" />
latin:keyWidth="fillRight" <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
latin:keyboardLayout="@xml/key_shortcut" /> <Spacer
latin:keyWidth="fillRight" />
</Row> </Row>
</merge> </merge>

32
java/res/xml/rows_number_password.xml
View File

@ -22,41 +22,59 @@
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>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="num1KeyStyle" /> latin:keyStyle="num1KeyStyle" />
<Key <Key
latin:keyStyle="num2KeyStyle" /> latin:keyStyle="num2KeyStyle" />
<Key <Key
latin:keyStyle="num3KeyStyle" /> latin:keyStyle="num3KeyStyle" />
<Spacer /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="num4KeyStyle" /> latin:keyStyle="num4KeyStyle" />
<Key <Key
latin:keyStyle="num5KeyStyle" /> latin:keyStyle="num5KeyStyle" />
<Key <Key
latin:keyStyle="num6KeyStyle" /> latin:keyStyle="num6KeyStyle" />
<Spacer /> <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="10%p" />
<Key <Key
latin:keyStyle="num7KeyStyle" /> latin:keyStyle="num7KeyStyle" />
<Key <Key
latin:keyStyle="num8KeyStyle" /> latin:keyStyle="num8KeyStyle" />
<Key <Key
latin:keyStyle="num9KeyStyle" /> latin:keyStyle="num9KeyStyle" />
<Key <!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
latin:keyStyle="deleteKeyStyle" <Spacer
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
<Row> <Row>
<Spacer /> <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="10%p" />
<Key
latin:keyStyle="deleteKeyStyle" />
<Key <Key
latin:keyStyle="num0KeyStyle" /> latin:keyStyle="num0KeyStyle" />
<Spacer />
<Key <Key
latin:keyStyle="enterKeyStyle" latin:keyStyle="enterKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="fillRight" /> latin:keyWidth="fillRight" />
</Row> </Row>
</merge> </merge>