New IceCreamSandwich assets and theme
This change instroduces new IceCreamSandwich assets and renames
Honeycomb theme to IceCreamSandwich. Though checked only on
hdpi-phone and mdpi-10"-tablet.
File another bug (Bug: 4852048) to fine tune keyboard layout for all
possible combination of devices and themes.
Bug: 4436327
Change-Id: I4f8dc1dd6b798a39204702bbcbebf17a199dc82f
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index 0c59fd8..e7d8d31 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -87,7 +87,6 @@
<key-style
latin:styleName="spaceKeyStyle"
latin:code="@integer/key_space"
- latin:keyIcon="iconSpaceKey"
latin:keyIconPreview="iconPreviewSpaceKey"
latin:parentStyle="functionalKeyStyle" />
<key-style
diff --git a/java/res/xml/kbd_numkey_styles.xml b/java/res/xml/kbd_numkey_styles.xml
index f53046a..3a26a02 100644
--- a/java/res/xml/kbd_numkey_styles.xml
+++ b/java/res/xml/kbd_numkey_styles.xml
@@ -62,17 +62,31 @@
latin:code="57"
latin:keyIcon="iconNum9Key" />
<key-style
+ latin:styleName="numLabelStyle"
+ latin:keyLabelOption="fontFixedWidth|followKeyLetterRatio" />
+ <key-style
+ latin:styleName="numLabelFunctionalStyle"
+ latin:keyLabelOption="fontFixedWidth|followKeyLetterRatio"
+ latin:parentStyle="functionalKeyStyle" />
+ <key-style
latin:styleName="numStarKeyStyle"
latin:code="42"
- latin:keyIcon="iconNumStarKey" />
+ latin:keyLabel="\uff0a"
+ latin:parentStyle="numLabelStyle" />
<key-style
latin:styleName="numPoundKeyStyle"
- latin:code="35"
- latin:keyIcon="iconNumPoundKey" />
+ latin:keyLabel="#"
+ latin:parentStyle="numLabelStyle" />
<key-style
- latin:styleName="numAltKeyStyle"
+ latin:styleName="numSwitchToAltKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
- latin:keyIcon="iconNumAltKey" />
+ latin:keyLabel="@string/label_to_phone_symbols_key"
+ latin:parentStyle="numLabelStyle" />
+ <key-style
+ latin:styleName="numSwitchToNumericKeyStyle"
+ latin:code="@integer/key_switch_alpha_symbol"
+ latin:keyLabel="@string/label_to_phone_numeric_key"
+ latin:parentStyle="numLabelStyle" />
<key-style
latin:styleName="numSpaceKeyStyle"
latin:code="@integer/key_space"
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index 211f7b7..794528c 100644
--- a/java/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
@@ -38,7 +38,7 @@
latin:keyStyle="num3KeyStyle" />
<Key
latin:keyLabel="-"
- latin:keyStyle="functionalKeyStyle"
+ latin:keyStyle="numLabelFunctionalStyle"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
</Row>
@@ -52,7 +52,7 @@
latin:keyStyle="num6KeyStyle" />
<Key
latin:keyLabel="."
- latin:keyStyle="functionalKeyStyle"
+ latin:keyStyle="numLabelFunctionalStyle"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
</Row>
@@ -73,7 +73,7 @@
latin:rowEdgeFlags="bottom"
>
<Key
- latin:keyStyle="numAltKeyStyle"
+ latin:keyStyle="numSwitchToAltKeyStyle"
latin:keyEdgeFlags="left" />
<Key
latin:keyStyle="num0KeyStyle" />
diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml
index c651363..1405c3c 100644
--- a/java/res/xml/kbd_phone_symbols.xml
+++ b/java/res/xml/kbd_phone_symbols.xml
@@ -31,20 +31,24 @@
>
<Key
latin:keyLabel="("
+ latin:keyStyle="numLabelStyle"
latin:keyEdgeFlags="left" />
<Key
- latin:keyLabel="/" />
+ latin:keyLabel="/"
+ latin:keyStyle="numLabelStyle" />
<Key
- latin:keyLabel=")" />
+ latin:keyLabel=")"
+ latin:keyStyle="numLabelStyle" />
<Key
latin:keyLabel="-"
- latin:keyStyle="functionalKeyStyle"
+ latin:keyStyle="numLabelFunctionalStyle"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
latin:keyLabel="N"
+ latin:keyStyle="numLabelStyle"
latin:keyEdgeFlags="left" />
<!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
has changed. -->
@@ -52,10 +56,11 @@
latin:code="44"
latin:keyLabel="Pause" />
<Key
- latin:keyLabel="," />
+ latin:keyLabel=","
+ latin:keyStyle="numLabelStyle" />
<Key
latin:keyLabel="."
- latin:keyStyle="functionalKeyStyle"
+ latin:keyStyle="numLabelFunctionalStyle"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
</Row>
@@ -68,7 +73,8 @@
latin:code="59"
latin:keyLabel="Wait" />
<Key
- latin:keyStyle="numPoundKeyStyle" />
+ latin:keyLabel="#"
+ latin:keyStyle="numLabelStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
@@ -78,11 +84,11 @@
latin:rowEdgeFlags="bottom"
>
<Key
- latin:code="@integer/key_switch_alpha_symbol"
- latin:keyLabel="@string/label_to_numeric_key"
+ latin:keyStyle="numSwitchToNumericKeyStyle"
latin:keyEdgeFlags="left" />
<Key
- latin:keyLabel="+" />
+ latin:keyLabel="+"
+ latin:keyStyle="numLabelStyle" />
<Key
latin:keyStyle="numSpaceKeyStyle" />
<Key