Fix symbol letter size of phone/number layout
This CL
- decreases the size of symbols letter on number and phone layout.
- increases the size of "Pause" and "Wait" label.
- fixes "Pause" and "Wait" label for no language keyboard
Bug: 18179572
Change-Id: I6e8b4a8e07d805c3da0558b4832291ce41ad3db0
diff --git a/java/res/xml/key_styles_number.xml b/java/res/xml/key_styles_number.xml
index aac0976..911c276 100644
--- a/java/res/xml/key_styles_number.xml
+++ b/java/res/xml/key_styles_number.xml
@@ -33,9 +33,7 @@
latin:keyLabelFlags="fontNormal|followKeyLetterRatio|followFunctionalTextColor"
latin:parentStyle="numKeyBaseStyle" />
<key-style
- latin:styleName="numFunctionalKeyStyle"
- latin:keyLabelFlags="followKeyLargeLetterRatio"
- latin:backgroundType="functional"
+ latin:styleName="numSymbolKeyStyle"
latin:parentStyle="numKeyBaseStyle" />
<key-style
latin:styleName="numberKeyStyle"
@@ -89,11 +87,6 @@
latin:keySpec="9"
latin:keyHintLabel="WXYZ"
latin:parentStyle="numberKeyStyle" />
- <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
- <key-style
- latin:styleName="numStarKeyStyle"
- latin:keySpec="＊|*"
- latin:parentStyle="numKeyStyle" />
<!-- Only for non-tablet device -->
<key-style
latin:styleName="numPhoneToSymbolKeyStyle"
@@ -104,16 +97,6 @@
latin:keySpec="!text/keylabel_to_phone_numeric|!code/key_switch_alpha_symbol"
latin:parentStyle="numModeKeyStyle" />
<key-style
- latin:styleName="numPauseKeyStyle"
- latin:keySpec="!text/label_pause_key|,"
- latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
- latin:parentStyle="numKeyBaseStyle" />
- <key-style
- latin:styleName="numWaitKeyStyle"
- latin:keySpec="!text/label_wait_key|;"
- latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
- latin:parentStyle="numKeyBaseStyle" />
- <key-style
latin:styleName="numTabKeyStyle"
latin:keyActionFlags="noKeyPreview"
latin:parentStyle="tabKeyStyle" />
diff --git a/java/res/xml/rows_number_normal.xml b/java/res/xml/rows_number_normal.xml
index d8d1508..0f92ac6 100644
--- a/java/res/xml/rows_number_normal.xml
+++ b/java/res/xml/rows_number_normal.xml
@@ -35,7 +35,8 @@
latin:keySpec="-"
latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint"
- latin:keyStyle="numFunctionalKeyStyle"
+ latin:keyStyle="numKeyStyle"
+ latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</Row>
<Row>
@@ -54,7 +55,8 @@
>
<Key
latin:keySpec="."
- latin:keyStyle="numFunctionalKeyStyle"
+ latin:keyStyle="numKeyStyle"
+ latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</case>
<case
@@ -62,15 +64,17 @@
>
<Key
latin:keySpec="."
- latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/morekeys_am_pm"
- latin:keyStyle="numFunctionalKeyStyle"
+ latin:keyLabelFlags="hasPopupHint"
+ latin:keyStyle="numKeyStyle"
+ latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</case>
<default>
<Key
latin:keySpec=","
- latin:keyStyle="numFunctionalKeyStyle"
+ latin:keyStyle="numKeyStyle"
+ latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</default>
</switch>
diff --git a/java/res/xml/rows_phone.xml b/java/res/xml/rows_phone.xml
index 03e4541..bb5590d 100644
--- a/java/res/xml/rows_phone.xml
+++ b/java/res/xml/rows_phone.xml
@@ -36,7 +36,8 @@
latin:keySpec="-"
latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint"
- latin:keyStyle="numFunctionalKeyStyle"
+ latin:keyStyle="numKeyStyle"
+ latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</Row>
<Row>
@@ -48,7 +49,8 @@
latin:keyStyle="num6KeyStyle" />
<Key
latin:keySpec="."
- latin:keyStyle="numFunctionalKeyStyle"
+ latin:keyStyle="numKeyStyle"
+ latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</Row>
<Row>
diff --git a/java/res/xml/rows_phone_symbols.xml b/java/res/xml/rows_phone_symbols.xml
index 983bfb5..195a183 100644
--- a/java/res/xml/rows_phone_symbols.xml
+++ b/java/res/xml/rows_phone_symbols.xml
@@ -28,45 +28,53 @@
<Row>
<Key
latin:keySpec="("
- latin:keyStyle="numKeyStyle" />
+ latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec="/"
- latin:keyStyle="numKeyStyle" />
+ latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec=")"
- latin:keyStyle="numKeyStyle" />
+ latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec="-"
latin:moreKeys="+"
latin:keyLabelFlags="hasPopupHint"
- latin:keyStyle="numFunctionalKeyStyle"
+ latin:keyStyle="numKeyStyle"
+ latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</Row>
<Row>
<Key
latin:keySpec="N"
- latin:keyStyle="numKeyBaseStyle" />
+ latin:keyStyle="numSymbolKeyStyle" />
<!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
has changed. -->
<Key
- latin:keyStyle="numPauseKeyStyle" />
+ latin:keySpec="!string/label_pause_key|,"
+ latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
+ latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec=","
- latin:keyStyle="numKeyStyle" />
+ latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec="."
- latin:keyStyle="numFunctionalKeyStyle"
+ latin:keyStyle="numKeyStyle"
+ latin:backgroundType="functional"
latin:keyWidth="fillRight" />
</Row>
<Row>
+ <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->
<Key
- latin:keyStyle="numStarKeyStyle" />
+ latin:keySpec="＊|*"
+ latin:keyStyle="numSymbolKeyStyle" />
<!-- Wait is a semicolon. -->
<Key
- latin:keyStyle="numWaitKeyStyle" />
+ latin:keySpec="!string/label_wait_key|;"
+ latin:keyLabelFlags="followKeyLabelRatio|autoXScale"
+ latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keySpec="\#"
- latin:keyStyle="numKeyStyle" />
+ latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
@@ -76,7 +84,7 @@
latin:keyStyle="numPhoneToNumericKeyStyle" />
<Key
latin:keySpec="+"
- latin:keyStyle="numKeyStyle" />
+ latin:keyStyle="numSymbolKeyStyle" />
<Key
latin:keyStyle="numSpaceKeyStyle" />
<Key