From 6de535c35e12c512001026a3f24f90a5c8169308 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Thu, 17 May 2012 13:06:26 +0900
Subject: [PATCH] Tidy up number password layout
Bug: 6462191
Change-Id: Idd156e2fd651b80a6b5ebb2b10d88e107febbddb
---
java/res/xml-sw600dp/rows_number_password.xml | 26 ++++++++-------
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 36f4bba466..6c3855a019 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 e4272ed3f4..2e61a08ae5 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>
--
GitLab