Introduce autoXScale label option
Bug: 5267649
Change-Id: I7fdcb98c209b7ccf73075ef3a4e758782fe161e3
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index a456b22..a876e28 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -217,6 +217,7 @@
<flag name="hasHintLabel" value="0x800" />
<flag name="withIconLeft" value="0x1000" />
<flag name="withIconRight" value="0x2000" />
+ <flag name="autoXScale" value="0x4000" />
</attr>
<!-- The icon to display on the key instead of the label. -->
<attr name="keyIcon" format="enum">
diff --git a/java/res/xml-sw600dp/kbd_phone_shift.xml b/java/res/xml-sw600dp/kbd_phone_shift.xml
index 2b6936d..4c4f8ad 100644
--- a/java/res/xml-sw600dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw600dp/kbd_phone_shift.xml
@@ -41,6 +41,7 @@
<Key
latin:code="44"
latin:keyLabel="@string/label_pause_key"
+ latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num1KeyStyle"
@@ -69,6 +70,7 @@
<Key
latin:code="59"
latin:keyLabel="@string/label_wait_key"
+ latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num4KeyStyle"
diff --git a/java/res/xml-sw768dp/kbd_phone_shift.xml b/java/res/xml-sw768dp/kbd_phone_shift.xml
index 646f0b8..46f67d3 100644
--- a/java/res/xml-sw768dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw768dp/kbd_phone_shift.xml
@@ -43,6 +43,7 @@
<Key
latin:code="44"
latin:keyLabel="@string/label_pause_key"
+ latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"
latin:keyWidth="8.047%p" />
<Key
latin:keyStyle="num1KeyStyle"
@@ -72,6 +73,7 @@
<Key
latin:code="59"
latin:keyLabel="@string/label_wait_key"
+ latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"
latin:keyWidth="8.047%p" />
<Key
latin:keyStyle="num4KeyStyle"
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index 12eab22..84b1900 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -101,6 +101,7 @@
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyLabel="@string/label_go_key"
+ latin:keyLabelOption="autoXScale"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
@@ -110,6 +111,7 @@
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyLabel="@string/label_next_key"
+ latin:keyLabelOption="autoXScale"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
@@ -119,6 +121,7 @@
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyLabel="@string/label_done_key"
+ latin:keyLabelOption="autoXScale"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
@@ -128,6 +131,7 @@
latin:styleName="returnKeyStyle"
latin:code="@integer/key_return"
latin:keyLabel="@string/label_send_key"
+ latin:keyLabelOption="autoXScale"
latin:parentStyle="functionalKeyStyle" />
</case>
<case
diff --git a/java/res/xml/kbd_phone_shift.xml b/java/res/xml/kbd_phone_shift.xml
index 89a9bd0..5be9bf9 100644
--- a/java/res/xml/kbd_phone_shift.xml
+++ b/java/res/xml/kbd_phone_shift.xml
@@ -49,7 +49,7 @@
<Key
latin:code="44"
latin:keyLabel="@string/label_pause_key"
- latin:keyLabelOption="followKeyHintLabelRatio" />
+ latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" />
<Key
latin:keyLabel=","
latin:keyStyle="numKeyStyle" />
@@ -65,7 +65,7 @@
<Key
latin:code="59"
latin:keyLabel="@string/label_wait_key"
- latin:keyLabelOption="followKeyHintLabelRatio" />
+ latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" />
<Key
latin:keyLabel="#"
latin:keyStyle="numKeyStyle" />