aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/xml-sw600dp
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-11-04 08:49:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-04 08:49:46 +0000
commited264f80dc4151ecd3d0ecbffd5be9008010e050 (patch)
treec274a38377d72981f9921981b238bc194bf4fc66 /java/res/xml-sw600dp
parentb9ba5fc778468c200727f77163ef81e378b5b70e (diff)
parent981d465d78642c1ba142c5f9c4d03821d5f2dfe6 (diff)
downloadlatinime-ed264f80dc4151ecd3d0ecbffd5be9008010e050.tar.gz
latinime-ed264f80dc4151ecd3d0ecbffd5be9008010e050.tar.xz
latinime-ed264f80dc4151ecd3d0ecbffd5be9008010e050.zip
Merge "Fix symbol letter size of phone/number layout"
Diffstat (limited to 'java/res/xml-sw600dp')
-rw-r--r--java/res/xml-sw600dp/rows_number_normal.xml28
-rw-r--r--java/res/xml-sw600dp/rows_phone.xml28
2 files changed, 33 insertions, 23 deletions
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
index 7a4700d5a..e6fdf73ec 100644
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -24,17 +24,17 @@
<Row>
<Key
latin:keySpec="-"
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="+"
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="."
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
@@ -53,13 +53,15 @@
latin:keyWidth="fillRight" />
</Row>
<Row>
+ <!-- U+FF0A: "*" FULLWIDTH ASTERISK -->
<Key
- latin:keyStyle="numStarKeyStyle"
+ latin:keySpec="&#xFF0A;|*"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="/"
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<switch>
@@ -70,14 +72,14 @@
latin:keySpec=","
latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/morekeys_am_pm"
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</case>
<default>
<Key
latin:keySpec=","
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</default>
@@ -100,12 +102,12 @@
<Row>
<Key
latin:keySpec="("
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec=")"
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<switch>
@@ -114,14 +116,14 @@
>
<Key
latin:keySpec=":"
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</case>
<default>
<Key
latin:keySpec="="
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
</default>
@@ -143,8 +145,10 @@
<Key
latin:keyStyle="tabletNumSpaceKeyStyle"
latin:keyWidth="30%p" />
+ <!-- U+FF0A: "*" FULLWIDTH ASTERISK -->
<Key
- latin:keyStyle="numStarKeyStyle"
+ latin:keySpec="&#xFF0A;|*"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyXPos="31%p" />
<Key
latin:keySpec="0"
diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
index e598c9664..fc86a7670 100644
--- a/java/res/xml-sw600dp/rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -28,16 +28,18 @@
<Row>
<Key
latin:keySpec="-"
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="+"
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyStyle="numPauseKeyStyle"
+ latin:keySpec="!string/label_pause_key|,"
+ latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
@@ -55,16 +57,18 @@
<Row>
<Key
latin:keySpec=","
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="."
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
- latin:keyStyle="numWaitKeyStyle"
+ latin:keySpec="!string/label_wait_key|;"
+ latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
@@ -82,17 +86,17 @@
<Row>
<Key
latin:keySpec="("
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec=")"
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
latin:keySpec="N"
- latin:keyStyle="numKeyStyle"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyWidth="10%p"
latin:backgroundType="functional" />
<Key
@@ -109,14 +113,16 @@
<Key
latin:keyStyle="tabletNumSpaceKeyStyle"
latin:keyWidth="30%p" />
+ <!-- U+FF0A: "*" FULLWIDTH ASTERISK -->
<Key
- latin:keyStyle="numStarKeyStyle"
+ latin:keySpec="&#xFF0A;|*"
+ latin:keyStyle="numSymbolKeyStyle"
latin:keyXPos="31%p" />
<Key
latin:keyStyle="num0KeyStyle"
latin:keyHintLabel="+" />
<Key
latin:keySpec="\#"
- latin:keyStyle="numKeyStyle" />
+ latin:keyStyle="numSymbolKeyStyle" />
</Row>
</merge>