aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-11-04 05:39:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-04 05:39:01 +0000
commit7824b0fd2b01dda3b5f84ae985cc71bd35e55c8f (patch)
tree9b9767951e7c03bb82b1da35f91adb3fbd9f2d49 /java
parent8f69356e4a736018872cb5d21c4108f960c6a83e (diff)
parentd071545df9fb255bf86c03998563dfc2154c5f8c (diff)
downloadlatinime-7824b0fd2b01dda3b5f84ae985cc71bd35e55c8f.tar.gz
latinime-7824b0fd2b01dda3b5f84ae985cc71bd35e55c8f.tar.xz
latinime-7824b0fd2b01dda3b5f84ae985cc71bd35e55c8f.zip
am d071545d: Fix number and phone keyboard visual glitches
* commit 'd071545df9fb255bf86c03998563dfc2154c5f8c': Fix number and phone keyboard visual glitches
Diffstat (limited to 'java')
-rw-r--r--java/res/xml-sw600dp/rows_number_password.xml3
-rw-r--r--java/res/xml-sw600dp/rows_phone.xml3
-rw-r--r--java/res/xml/key_styles_number.xml5
-rw-r--r--java/res/xml/rows_number_password.xml3
4 files changed, 8 insertions, 6 deletions
diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml
index 6c3855a01..37e63383e 100644
--- a/java/res/xml-sw600dp/rows_number_password.xml
+++ b/java/res/xml-sw600dp/rows_number_password.xml
@@ -70,7 +70,8 @@
<Key
latin:keyStyle="deleteKeyStyle" />
<Key
- latin:keyStyle="num0KeyStyle" />
+ latin:keyStyle="num0KeyStyle"
+ latin:keyHintLabel="+" />
<Key
latin:keyStyle="enterKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->
diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
index 612397a90..e598c9664 100644
--- a/java/res/xml-sw600dp/rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -113,7 +113,8 @@
latin:keyStyle="numStarKeyStyle"
latin:keyXPos="31%p" />
<Key
- latin:keyStyle="num0KeyStyle" />
+ latin:keyStyle="num0KeyStyle"
+ latin:keyHintLabel="+" />
<Key
latin:keySpec="\#"
latin:keyStyle="numKeyStyle" />
diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
index 847b43610..aac0976e4 100644
--- a/java/res/xml/key_styles_number.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -44,7 +44,6 @@
<key-style
latin:styleName="num0KeyStyle"
latin:keySpec="0"
- latin:keyHintLabel="+"
latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num1KeyStyle"
@@ -107,12 +106,12 @@
<key-style
latin:styleName="numPauseKeyStyle"
latin:keySpec="!text/label_pause_key|,"
- latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"
+ latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numWaitKeyStyle"
latin:keySpec="!text/label_wait_key|;"
- latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"
+ latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numTabKeyStyle"
diff --git a/java/res/xml/rows_number_password.xml b/java/res/xml/rows_number_password.xml
index 2e61a08ae..65736c430 100644
--- a/java/res/xml/rows_number_password.xml
+++ b/java/res/xml/rows_number_password.xml
@@ -70,7 +70,8 @@
<Key
latin:keyStyle="deleteKeyStyle" />
<Key
- latin:keyStyle="num0KeyStyle" />
+ latin:keyStyle="num0KeyStyle"
+ latin:keyHintLabel="+" />
<Key
latin:keyStyle="enterKeyStyle" />
<!-- Note: This Spacer prevents the above key from being marked as a right edge key. -->