Add Key.keyHintLabel and remove Key.keyHintIcon
This change also removes manualTemporaryUpperCaseCode and
manualTemporaryUpperCaseHintIcon. Instead of these keyLabelOption now
has hasUppercaseLetter flag value.
Bug: 4436327
Change-Id: I88fdac1e888a7123735296f5ef45f5fdd565cd2e
diff --git a/java/res/xml-sw600dp/kbd_azerty_rows.xml b/java/res/xml-sw600dp/kbd_azerty_rows.xml
index 99c56e4..269c6ef 100644
--- a/java/res/xml-sw600dp/kbd_azerty_rows.xml
+++ b/java/res/xml-sw600dp/kbd_azerty_rows.xml
@@ -137,15 +137,13 @@
<default>
<Key
latin:keyLabel=","
- latin:manualTemporaryUpperCaseCode="33"
- latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
- latin:manualTemporaryUpperCaseCode="63"
- latin:keyHintIcon="@drawable/key_hint_question_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index b20bb24..cf0e523 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -36,13 +36,11 @@
<!-- This row is intentionally not marked as a top row -->
<Row>
<Key
- latin:code="45"
- latin:keyLabel=" - "
+ latin:keyLabel="-"
latin:keyXPos="15.625%p"
latin:keyWidth="9.25%p" />
<Key
- latin:code="43"
- latin:keyLabel=" + "
+ latin:keyLabel="+"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num1KeyStyle"
@@ -59,13 +57,11 @@
</Row>
<Row>
<Key
- latin:code="44"
- latin:keyLabel=" , "
+ latin:keyLabel=","
latin:keyXPos="15.625%p"
latin:keyWidth="9.25%p" />
<Key
- latin:code="46"
- latin:keyLabel=" . "
+ latin:keyLabel="."
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num4KeyStyle"
@@ -88,13 +84,11 @@
<!-- There is an empty area below the "More" key and left of the "(" key. To ignore
the touch event on the area, "(" is intentionally not marked as a left edge key. -->
<Key
- latin:code="40"
- latin:keyLabel=" ( "
+ latin:keyLabel="("
latin:keyXPos="15.625%p"
latin:keyWidth="9.25%p" />
<Key
- latin:code="41"
- latin:keyLabel=" ) "
+ latin:keyLabel=")"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num7KeyStyle"
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
index 7f62673..3565285 100644
--- a/java/res/xml-sw600dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -36,13 +36,11 @@
<!-- This row is intentionally not marked as a top row -->
<Row>
<Key
- latin:code="45"
- latin:keyLabel=" - "
+ latin:keyLabel="-"
latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
- latin:code="43"
- latin:keyLabel=" + "
+ latin:keyLabel="+"
latin:keyWidth="9.25%p" />
<Key
latin:code="44"
@@ -63,13 +61,11 @@
</Row>
<Row>
<Key
- latin:code="44"
- latin:keyLabel=" , "
+ latin:keyLabel=","
latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
- latin:code="46"
- latin:keyLabel=" . "
+ latin:keyLabel="."
latin:keyWidth="9.25%p" />
<Key
latin:code="59"
@@ -96,16 +92,13 @@
<!-- There is an empty area below the "More" key and left of the "(" key. To ignore
the touch event on the area, "(" is intentionally not marked as a left edge key. -->
<Key
- latin:code="40"
- latin:keyLabel=" ( "
+ latin:keyLabel="("
latin:keyWidth="9.25%p" />
<Key
- latin:code="41"
- latin:keyLabel=" ) "
+ latin:keyLabel=")"
latin:keyWidth="9.25%p" />
<Key
- latin:code="78"
- latin:keyLabel=" N "
+ latin:keyLabel="N"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num7KeyStyle"
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
index 4118ee1..0dbc5cf 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
@@ -58,15 +58,13 @@
<default>
<Key
latin:keyLabel=","
- latin:manualTemporaryUpperCaseCode="33"
- latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
- latin:manualTemporaryUpperCaseCode="63"
- latin:keyHintIcon="@drawable/key_hint_question_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
index 3e5492e..49e377f 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
@@ -48,9 +48,8 @@
<default>
<Key
latin:keyLabel="/"
- latin:manualTemporaryUpperCaseCode="64"
- latin:keyHintIcon="@drawable/key_hint_at_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="\@"
latin:popupCharacters="\@" />
</default>
</switch>
@@ -75,18 +74,16 @@
>
<Key
latin:keyLabel="/"
- latin:manualTemporaryUpperCaseCode="58"
- latin:keyHintIcon="@drawable/key_hint_colon_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter=":"
latin:popupCharacters=":"
latin:keyWidth="9.750%p" />
</case>
<default>
<Key
latin:keyLabel="\?"
- latin:manualTemporaryUpperCaseCode="95"
- latin:keyHintIcon="@drawable/key_hint_underline_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="_"
latin:popupCharacters="_"
latin:keyWidth="9.750%p" />
</default>
@@ -102,9 +99,8 @@
<default>
<Key
latin:keyLabel="!"
- latin:manualTemporaryUpperCaseCode="39"
- latin:keyHintIcon="@drawable/key_hint_quote_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="\'"
latin:popupCharacters="\'"
latin:keyWidth="9.750%p" />
</default>
@@ -125,18 +121,16 @@
>
<Key
latin:keyLabel="/"
- latin:manualTemporaryUpperCaseCode="58"
- latin:keyHintIcon="@drawable/key_hint_colon_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter=":"
latin:popupCharacters=":"
latin:keyWidth="9.750%p" />
</case>
<default>
<Key
latin:keyLabel="\'"
- latin:manualTemporaryUpperCaseCode="34"
- latin:keyHintIcon="@drawable/key_hint_quote_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="""
latin:popupCharacters="""
latin:keyWidth="9.750%p" />
</default>
@@ -152,9 +146,8 @@
<default>
<Key
latin:keyLabel="-"
- latin:manualTemporaryUpperCaseCode="95"
- latin:keyHintIcon="@drawable/key_hint_underline_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="_"
latin:popupCharacters="_"
latin:keyWidth="9.750%p" />
</default>
diff --git a/java/res/xml-sw600dp/kbd_qwertz_rows.xml b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
index 9e717c8..7ea9b0f 100644
--- a/java/res/xml-sw600dp/kbd_qwertz_rows.xml
+++ b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
@@ -103,15 +103,13 @@
<default>
<Key
latin:keyLabel=","
- latin:manualTemporaryUpperCaseCode="33"
- latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
- latin:manualTemporaryUpperCaseCode="63"
- latin:keyHintIcon="@drawable/key_hint_question_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-sw600dp/kbd_row3_right.xml b/java/res/xml-sw600dp/kbd_row3_right.xml
index 6f7d40b..a9c5eb3 100644
--- a/java/res/xml-sw600dp/kbd_row3_right.xml
+++ b/java/res/xml-sw600dp/kbd_row3_right.xml
@@ -36,9 +36,8 @@
>
<Key
latin:keyLabel="-"
- latin:manualTemporaryUpperCaseCode="95"
- latin:keyHintIcon="@drawable/key_hint_underline_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="_"
latin:popupCharacters="_"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth"
@@ -49,9 +48,8 @@
>
<Key
latin:keyLabel=":"
- latin:manualTemporaryUpperCaseCode="43"
- latin:keyHintIcon="@drawable/key_hint_plus_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="+"
latin:popupCharacters="+"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth"
diff --git a/java/res/xml-sw600dp/kbd_ru_rows.xml b/java/res/xml-sw600dp/kbd_ru_rows.xml
index 714d1a8..43fa665 100644
--- a/java/res/xml-sw600dp/kbd_ru_rows.xml
+++ b/java/res/xml-sw600dp/kbd_ru_rows.xml
@@ -118,9 +118,8 @@
latin:keyLabel="ю" />
<Key
latin:keyLabel="."
- latin:manualTemporaryUpperCaseCode="44"
- latin:keyHintIcon="@drawable/key_hint_comma_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_comma_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter=","
latin:popupCharacters="," />
<include
latin:keyboardLayout="@xml/kbd_row3_right" />
diff --git a/java/res/xml-sw600dp/kbd_sr_rows.xml b/java/res/xml-sw600dp/kbd_sr_rows.xml
index 62c3b71..80debda 100644
--- a/java/res/xml-sw600dp/kbd_sr_rows.xml
+++ b/java/res/xml-sw600dp/kbd_sr_rows.xml
@@ -126,15 +126,13 @@
<default>
<Key
latin:keyLabel=","
- latin:manualTemporaryUpperCaseCode="33"
- latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
- latin:manualTemporaryUpperCaseCode="63"
- latin:keyHintIcon="@drawable/key_hint_question_holo"
- latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
+ latin:keyLabelOption="hasUppercaseLetter"
+ latin:keyHintLetter="\?"
latin:popupCharacters="\?" />
</default>
</switch>