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

am a1500959: Merge "Tidy up number password layout" into jb-dev 

* commit 'a1500959b657f3100914e2cf34f4aeb5d2e68c82':
  Tidy up number password layout
main
Tadashi G. Takaoka 2012-05-17 00:59:39 -07:00 committed by Android Git Automerger
parent 86fc5445ef a1500959b6
commit f579f51b04
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" />
<Key
latin:keyStyle="num3KeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-16%p"
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="fillRight" />
</Row>
<Row>
@ -46,9 +45,8 @@
latin:keyStyle="num5KeyStyle" />
<Key
latin:keyStyle="num6KeyStyle" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyXPos="-16%p"
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="fillRight" />
</Row>
<Row>
@ -62,17 +60,21 @@
<Key
latin:keyStyle="num9KeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer />
<Spacer
latin:keyWidth="fillRight" />
</Row>
<Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="41%p" />
latin:keyWidth="23%p" />
<Key
latin:keyStyle="deleteKeyStyle" />
<Key
latin:keyStyle="num0KeyStyle" />
<include
latin:keyXPos="-10%p"
latin:keyWidth="fillRight"
latin:keyboardLayout="@xml/key_shortcut" />
<Key
latin:keyStyle="enterKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="fillRight" />
</Row>
</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"
>
<Row>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="10%p" />
<Key
latin:keyStyle="num1KeyStyle" />
<Key
latin:keyStyle="num2KeyStyle" />
<Key
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>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="10%p" />
<Key
latin:keyStyle="num4KeyStyle" />
<Key
latin:keyStyle="num5KeyStyle" />
<Key
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>
<!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
<Spacer
latin:keyWidth="10%p" />
<Key
latin:keyStyle="num7KeyStyle" />
<Key
latin:keyStyle="num8KeyStyle" />
<Key
latin:keyStyle="num9KeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
<Spacer
latin:keyWidth="fillRight" />
</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
latin:keyStyle="num0KeyStyle" />
<Spacer />
<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" />
</Row>
</merge>