diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-05-21 11:52:10 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-21 11:52:10 -0700 |
| commit | ef674f677ca4def1967b310a8f7f686c3c77bfe9 (patch) | |
| tree | 965ecc026ac6cfd7df588808dd9e4b486d0cc6a0 /java | |
| parent | 3b35e505d0d50f44208e50b49b67524435b925e5 (diff) | |
| parent | f579f51b0444cfe613c3edefedaae33c629b6860 (diff) | |
| download | latinime-ef674f677ca4def1967b310a8f7f686c3c77bfe9.tar.gz latinime-ef674f677ca4def1967b310a8f7f686c3c77bfe9.tar.xz latinime-ef674f677ca4def1967b310a8f7f686c3c77bfe9.zip | |
am f579f51b: am a1500959: Merge "Tidy up number password layout" into jb-dev
* commit 'f579f51b0444cfe613c3edefedaae33c629b6860':
Tidy up number password layout
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/xml-sw600dp/rows_number_password.xml | 26 | ||||
| -rw-r--r-- | java/res/xml/rows_number_password.xml | 32 |
2 files changed, 39 insertions, 19 deletions
diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml index 36f4bba46..6c3855a01 100644 --- a/java/res/xml-sw600dp/rows_number_password.xml +++ b/java/res/xml-sw600dp/rows_number_password.xml @@ -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> diff --git a/java/res/xml/rows_number_password.xml b/java/res/xml/rows_number_password.xml index e4272ed3f..2e61a08ae 100644 --- a/java/res/xml/rows_number_password.xml +++ b/java/res/xml/rows_number_password.xml @@ -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> |