Add popupKeyboardTemplate attribute to Keyboard
This change
- introduces the popupKeyboardTemplate attribute of Keyboard to
specify XML Keyboard file for popup mini keyboard.
- introduces the maxPopupKeyboardColumn attribute of Keyboard to
specify the maximum column of popup mini keyboard.
- changes the content format of the popupCharacters attribute of Key.
It now represents keyLabel, codes and keyTextOutput of each key of
popup mini keyboard using CSV format.
Bug: 2214959
Change-Id: I539e310f7e38a049ee193de0b4ad5d7afdce37b1
diff --git a/java/res/xml-xlarge/kbd_azerty_rows.xml b/java/res/xml-xlarge/kbd_azerty_rows.xml
index b68e214..6162950 100644
--- a/java/res/xml-xlarge/kbd_azerty_rows.xml
+++ b/java/res/xml-xlarge/kbd_azerty_rows.xml
@@ -33,43 +33,33 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="a"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_a" />
<Key
latin:keyLabel="z"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_z" />
<Key
latin:keyLabel="e"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="y"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_y" />
<Key
latin:keyLabel="u"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_p" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -86,21 +76,17 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="q"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_q" />
<Key
latin:keyLabel="s"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_s" />
<Key
latin:keyLabel="d"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_d" />
<Key
latin:keyLabel="f" />
<Key
latin:keyLabel="g"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_g" />
<Key
latin:keyLabel="h" />
@@ -110,7 +96,6 @@
latin:keyLabel="k" />
<Key
latin:keyLabel="l"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_l" />
<Key
latin:keyLabel="m"
@@ -129,30 +114,25 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="w"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_w" />
<Key
latin:keyLabel="x" />
<Key
latin:keyLabel="c"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_c" />
<Key
latin:keyLabel="v"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_v" />
<Key
latin:keyLabel="b" />
<Key
latin:keyLabel="n"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_n" />
<Key
latin:keyLabel="\'"
latin:manualTemporaryUpperCaseCode="58"
latin:keyHintIcon="@drawable/key_hint_colon_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=":" />
<switch>
<case
@@ -169,14 +149,12 @@
latin:manualTemporaryUpperCaseCode="33"
latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:manualTemporaryUpperCaseCode="63"
latin:keyHintIcon="@drawable/key_hint_question_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-xlarge/kbd_key_styles.xml b/java/res/xml-xlarge/kbd_key_styles.xml
index be46111..6c1df0b 100644
--- a/java/res/xml-xlarge/kbd_key_styles.xml
+++ b/java/res/xml-xlarge/kbd_key_styles.xml
@@ -62,11 +62,11 @@
latin:iconPreview="@drawable/sym_keyboard_feedback_space" />
<key-style
latin:styleName="smileyKeyStyle"
- latin:codes="0"
latin:keyIcon="@drawable/sym_keyboard_smiley_holo"
latin:keyOutputText=";-) "
latin:keyHintIcon="@drawable/hint_popup_holo"
- latin:popupKeyboard="@xml/popup_smileys" />
+ latin:popupCharacters="@string/alternates_for_smiley"
+ latin:maxPopupKeyboardColumn="5" />
<key-style
latin:styleName="micKeyStyle"
latin:codes="@integer/key_voice"
@@ -115,7 +115,8 @@
latin:keyLabel=";-)"
latin:keyOutputText=";-) "
latin:keyHintIcon="@drawable/hint_popup_holo"
- latin:popupKeyboard="@xml/popup_smileys" />
+ latin:popupCharacters="@string/alternates_for_smiley"
+ latin:maxPopupKeyboardColumn="5" />
<key-style
latin:styleName="micKeyStyle"
latin:codes="@integer/key_voice"
@@ -151,9 +152,9 @@
latin:isSticky="true" />
<key-style
latin:styleName="comKeyStyle"
- latin:keyLabel="@string/popular_domain_0"
+ latin:keyLabel="@string/keylabel_for_popular_domain"
latin:keyLabelOption="fontNormal"
- latin:keyOutputText="@string/popular_domain_0"
+ latin:keyOutputText="@string/keylabel_for_popular_domain"
latin:keyHintIcon="@drawable/hint_popup_holo"
- latin:popupKeyboard="@xml/popup_domains" />
+ latin:popupCharacters="@string/alternates_for_popular_domain" />
</merge>
diff --git a/java/res/xml-xlarge/kbd_number.xml b/java/res/xml-xlarge/kbd_number.xml
index 11cf8fb..93bc136 100644
--- a/java/res/xml-xlarge/kbd_number.xml
+++ b/java/res/xml-xlarge/kbd_number.xml
@@ -26,6 +26,8 @@
latin:keyWidth="11.949%p"
latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap"
+ latin:popupKeyboardTemplate="@xml/kbd_popup_template"
+ latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column"
>
<include
latin:keyboardLayout="@xml/kbd_key_styles" />
diff --git a/java/res/xml-xlarge/kbd_phone.xml b/java/res/xml-xlarge/kbd_phone.xml
index 6389a8c..66f6020 100644
--- a/java/res/xml-xlarge/kbd_phone.xml
+++ b/java/res/xml-xlarge/kbd_phone.xml
@@ -26,6 +26,8 @@
latin:keyWidth="11.949%p"
latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap"
+ latin:popupKeyboardTemplate="@xml/kbd_popup_template"
+ latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column"
>
<include
latin:keyboardLayout="@xml/kbd_key_styles" />
diff --git a/java/res/xml-xlarge/kbd_phone_symbols.xml b/java/res/xml-xlarge/kbd_phone_symbols.xml
index 59d8181..8c0df03 100644
--- a/java/res/xml-xlarge/kbd_phone_symbols.xml
+++ b/java/res/xml-xlarge/kbd_phone_symbols.xml
@@ -26,6 +26,8 @@
latin:keyWidth="11.949%p"
latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap"
+ latin:popupKeyboardTemplate="@xml/kbd_popup_template"
+ latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column"
>
<include
latin:keyboardLayout="@xml/kbd_key_styles" />
diff --git a/java/res/xml-xlarge/kbd_qwerty.xml b/java/res/xml-xlarge/kbd_qwerty.xml
index 75fe183..1c8d51f 100644
--- a/java/res/xml-xlarge/kbd_qwerty.xml
+++ b/java/res/xml-xlarge/kbd_qwerty.xml
@@ -25,6 +25,8 @@
latin:rowHeight="25%p"
latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap"
+ latin:popupKeyboardTemplate="@xml/kbd_popup_template"
+ latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column"
>
<include
latin:keyboardLayout="@xml/kbd_qwerty_rows" />
diff --git a/java/res/xml-xlarge/kbd_qwerty_row1.xml b/java/res/xml-xlarge/kbd_qwerty_row1.xml
index 1596867..f513559 100644
--- a/java/res/xml-xlarge/kbd_qwerty_row1.xml
+++ b/java/res/xml-xlarge/kbd_qwerty_row1.xml
@@ -32,43 +32,33 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="q"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_q" />
<Key
latin:keyLabel="w"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_w" />
<Key
latin:keyLabel="e"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="y"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_y" />
<Key
latin:keyLabel="u"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_p" />
<Key
latin:keyStyle="deleteKeyStyle"
diff --git a/java/res/xml-xlarge/kbd_qwerty_row2.xml b/java/res/xml-xlarge/kbd_qwerty_row2.xml
index 2b9be10..1b4393a 100644
--- a/java/res/xml-xlarge/kbd_qwerty_row2.xml
+++ b/java/res/xml-xlarge/kbd_qwerty_row2.xml
@@ -31,21 +31,17 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="a"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_a" />
<Key
latin:keyLabel="s"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_s" />
<Key
latin:keyLabel="d"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_d" />
<Key
latin:keyLabel="f" />
<Key
latin:keyLabel="g"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_g" />
<Key
latin:keyLabel="h" />
@@ -55,7 +51,6 @@
latin:keyLabel="k" />
<Key
latin:keyLabel="l"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_l" />
<Key
latin:keyStyle="returnKeyStyle"
diff --git a/java/res/xml-xlarge/kbd_qwerty_row3.xml b/java/res/xml-xlarge/kbd_qwerty_row3.xml
index 209ef21..b7e9bcf 100644
--- a/java/res/xml-xlarge/kbd_qwerty_row3.xml
+++ b/java/res/xml-xlarge/kbd_qwerty_row3.xml
@@ -30,23 +30,19 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="z"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_z" />
<Key
latin:keyLabel="x" />
<Key
latin:keyLabel="c"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_c" />
<Key
latin:keyLabel="v"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_v" />
<Key
latin:keyLabel="b" />
<Key
latin:keyLabel="n"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_n" />
<Key
latin:keyLabel="m" />
@@ -65,14 +61,12 @@
latin:manualTemporaryUpperCaseCode="33"
latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:manualTemporaryUpperCaseCode="63"
latin:keyHintIcon="@drawable/key_hint_question_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-xlarge/kbd_qwerty_row4.xml b/java/res/xml-xlarge/kbd_qwerty_row4.xml
index 205f2e0..e222a6b 100644
--- a/java/res/xml-xlarge/kbd_qwerty_row4.xml
+++ b/java/res/xml-xlarge/kbd_qwerty_row4.xml
@@ -54,7 +54,6 @@
latin:manualTemporaryUpperCaseCode="43"
latin:keyHintIcon="@drawable/key_hint_plus_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_plus_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="+" />
</case>
<default>
@@ -67,7 +66,6 @@
latin:manualTemporaryUpperCaseCode="64"
latin:keyHintIcon="@drawable/key_hint_at_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_at_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\@" />
</default>
</switch>
@@ -89,7 +87,6 @@
latin:manualTemporaryUpperCaseCode="58"
latin:keyHintIcon="@drawable/key_hint_colon_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_colon_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=":" />
</case>
<default>
@@ -98,7 +95,6 @@
latin:manualTemporaryUpperCaseCode="34"
latin:keyHintIcon="@drawable/key_hint_quote_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_quote_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters=""" />
</default>
</switch>
@@ -115,7 +111,6 @@
latin:manualTemporaryUpperCaseCode="95"
latin:keyHintIcon="@drawable/key_hint_underline_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_underline_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="_" />
</default>
</switch>
diff --git a/java/res/xml-xlarge/kbd_qwerty_rows_scandinavia.xml b/java/res/xml-xlarge/kbd_qwerty_rows_scandinavia.xml
index c56d4f4..8c583ba 100644
--- a/java/res/xml-xlarge/kbd_qwerty_rows_scandinavia.xml
+++ b/java/res/xml-xlarge/kbd_qwerty_rows_scandinavia.xml
@@ -33,43 +33,33 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="q"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_q" />
<Key
latin:keyLabel="w"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_w" />
<Key
latin:keyLabel="e"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="y"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_y" />
<Key
latin:keyLabel="u"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_p" />
<Key
latin:keyLabel="å" />
@@ -88,21 +78,17 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="a"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_a" />
<Key
latin:keyLabel="s"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_s" />
<Key
latin:keyLabel="d"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_d" />
<Key
latin:keyLabel="f" />
<Key
latin:keyLabel="g"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_g" />
<Key
latin:keyLabel="h" />
@@ -112,15 +98,12 @@
latin:keyLabel="k" />
<Key
latin:keyLabel="l"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_l" />
<Key
latin:keyLabel="@string/keylabel_for_scandinavia_row2_10"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_scandinavia_row2_10" />
<Key
latin:keyLabel="@string/keylabel_for_scandinavia_row2_11"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_scandinavia_row2_11" />
<Key
latin:keyStyle="returnKeyStyle"
diff --git a/java/res/xml-xlarge/kbd_qwertz_rows.xml b/java/res/xml-xlarge/kbd_qwertz_rows.xml
index de15b5f..3e99f05 100644
--- a/java/res/xml-xlarge/kbd_qwertz_rows.xml
+++ b/java/res/xml-xlarge/kbd_qwertz_rows.xml
@@ -33,43 +33,33 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="q"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_q" />
<Key
latin:keyLabel="w"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_w" />
<Key
latin:keyLabel="e"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="z"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_z" />
<Key
latin:keyLabel="u"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_p" />
<Key
latin:keyStyle="deleteKeyStyle"
@@ -87,23 +77,19 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="y"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_y" />
<Key
latin:keyLabel="x" />
<Key
latin:keyLabel="c"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_c" />
<Key
latin:keyLabel="v"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_v" />
<Key
latin:keyLabel="b" />
<Key
latin:keyLabel="n"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="@string/alternates_for_n" />
<Key
latin:keyLabel="m" />
@@ -122,14 +108,12 @@
latin:manualTemporaryUpperCaseCode="33"
latin:keyHintIcon="@drawable/key_hint_exclamation_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_exclamation_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:manualTemporaryUpperCaseCode="63"
latin:keyHintIcon="@drawable/key_hint_question_holo"
latin:manualTemporaryUpperCaseHintIcon="@drawable/key_hint_question_large_holo"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml
index f78af8a..50b8e53 100644
--- a/java/res/xml-xlarge/kbd_symbols.xml
+++ b/java/res/xml-xlarge/kbd_symbols.xml
@@ -25,6 +25,8 @@
latin:rowHeight="25%p"
latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap"
+ latin:popupKeyboardTemplate="@xml/kbd_popup_template"
+ latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column"
>
<include
latin:keyboardLayout="@xml/kbd_key_styles" />
@@ -39,29 +41,23 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="1"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="¹½⅓¼⅛" />
+ latin:popupCharacters="¹,½,⅓,¼,⅛" />
<Key
latin:keyLabel="2"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="²⅔" />
+ latin:popupCharacters="²,⅔" />
<Key
latin:keyLabel="3"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="³¾⅜" />
+ latin:popupCharacters="³,¾,⅜" />
<Key
latin:keyLabel="4"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="⁴" />
<Key
latin:keyLabel="5"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="⅝" />
<Key
latin:keyLabel="6" />
<Key
latin:keyLabel="7"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="⅞" />
<Key
latin:keyLabel="8" />
@@ -69,8 +65,7 @@
latin:keyLabel="9" />
<Key
latin:keyLabel="0"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="ⁿ∅" />
+ latin:popupCharacters="ⁿ,∅" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="9.331%p"
@@ -88,34 +83,27 @@
latin:keyLabel="#" />
<Key
latin:keyLabel="$"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="¢£€¥₣₤₱" />
+ latin:popupCharacters="¢,£,€,¥,₣,₤,₱" />
<Key
latin:keyLabel="%"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="‰" />
<Key
latin:keyLabel="&" />
<Key
latin:keyLabel="*"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="†‡★" />
+ latin:popupCharacters="†,‡,★" />
<Key
latin:keyLabel="-"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="_–—" />
+ latin:popupCharacters="_,–,—" />
<Key
latin:keyLabel="+"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="±" />
<Key
latin:keyLabel="("
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="[{<" />
+ latin:popupCharacters="[,{,<" />
<Key
latin:keyLabel=")"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="]}>" />
+ latin:popupCharacters="],},>" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="15.750%p"
@@ -130,16 +118,13 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="<"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="≤«‹" />
+ latin:popupCharacters="≤,«,‹" />
<Key
latin:keyLabel=">"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="≥»›" />
+ latin:popupCharacters="≥,»,›" />
<Key
latin:keyLabel="="
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="≠≈" />
+ latin:popupCharacters="≠,≈" />
<Key
latin:keyLabel=":" />
<Key
@@ -150,11 +135,9 @@
latin:keyLabel="." />
<Key
latin:keyLabel="!"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="¡" />
<Key
latin:keyLabel="\?"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="¿" />
<Key
latin:keyStyle="moreKeyStyle"
@@ -176,8 +159,7 @@
latin:keyWidth="37.454%p" />
<Key
latin:keyLabel="""
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="“”«»˝" />
+ latin:popupCharacters="“,”,«,»,˝" />
<Key
latin:keyLabel="_" />
<Key
diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml
index f3fbf36..f586b1a 100644
--- a/java/res/xml-xlarge/kbd_symbols_shift.xml
+++ b/java/res/xml-xlarge/kbd_symbols_shift.xml
@@ -25,6 +25,8 @@
latin:rowHeight="25%p"
latin:horizontalGap="@dimen/key_horizontal_gap"
latin:verticalGap="@dimen/key_bottom_gap"
+ latin:popupKeyboardTemplate="@xml/kbd_popup_template"
+ latin:maxPopupKeyboardColumn="@integer/config_max_popup_keyboard_column"
>
<include
latin:keyboardLayout="@xml/kbd_key_styles" />
@@ -45,13 +47,11 @@
latin:keyLabel="|" />
<Key
latin:keyLabel="•"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="♪♥♠♦♣" />
+ latin:popupCharacters="♪,♥,♠,♦,♣" />
<Key
latin:keyLabel="√" />
<Key
latin:keyLabel="π"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="Π" />
<Key
latin:keyLabel="÷" />
@@ -59,7 +59,6 @@
latin:keyLabel="×" />
<Key
latin:keyLabel="§"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="¶" />
<Key
latin:keyLabel="Δ" />
@@ -86,13 +85,11 @@
latin:keyLabel="¥" />
<Key
latin:keyLabel="^"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="↑↓←→" />
+ latin:popupCharacters="↑,↓,←,→" />
<Key
latin:keyLabel="°" />
<Key
latin:keyLabel="±"
- latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="∞" />
<Key
latin:keyLabel="{" />
diff --git a/java/res/xml-xlarge/popup_domains.xml b/java/res/xml-xlarge/popup_domains.xml
deleted file mode 100644
index 6d65c89..0000000
--- a/java/res/xml-xlarge/popup_domains.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="5.5%p"
- latin:horizontalGap="0px"
- latin:verticalGap="0px"
- latin:rowHeight="@dimen/popup_key_height"
->
- <Row
- latin:rowEdgeFlags="top|bottom"
- >
- <Key
- latin:keyLabel="@string/popular_domain_1"
- latin:keyOutputText="@string/popular_domain_1"
- latin:keyEdgeFlags="left" />
- <Key
- latin:keyLabel="@string/popular_domain_2"
- latin:keyOutputText="@string/popular_domain_2" />
- <Key
- latin:keyLabel="@string/popular_domain_3"
- latin:keyOutputText="@string/popular_domain_3" />
- <Key
- latin:keyLabel="@string/popular_domain_4"
- latin:keyOutputText="@string/popular_domain_4"
- latin:keyEdgeFlags="right" />
- </Row>
-</Keyboard>
diff --git a/java/res/xml-xlarge/popup_smileys.xml b/java/res/xml-xlarge/popup_smileys.xml
deleted file mode 100644
index 552dc42..0000000
--- a/java/res/xml-xlarge/popup_smileys.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
- latin:keyWidth="5.0%p"
- latin:horizontalGap="0px"
- latin:verticalGap="0px"
- latin:rowHeight="@dimen/popup_key_height"
->
- <Row
- latin:rowEdgeFlags="top"
- >
- <Key
- latin:keyLabel=":-)"
- latin:keyOutputText=":-) "
- latin:keyEdgeFlags="left" />
- <Key
- latin:keyLabel=":-("
- latin:keyOutputText=":-( " />
- <Key
- latin:keyLabel=";-)"
- latin:keyOutputText=";-) " />
- <Key
- latin:keyLabel=":-P"
- latin:keyOutputText=":-P " />
- <Key
- latin:keyLabel="=-O"
- latin:keyOutputText="=-O "
- latin:keyEdgeFlags="right" />
- </Row>
- <Row>
- <Key
- latin:keyLabel=":-*"
- latin:keyOutputText=":-* "
- latin:keyEdgeFlags="left" />
- <Key
- latin:keyLabel=":O"
- latin:keyOutputText=":O " />
- <Key
- latin:keyLabel="B-)"
- latin:keyOutputText="B-) " />
- <Key
- latin:keyLabel=":-$"
- latin:keyOutputText=":-$ " />
- <Key
- latin:keyLabel=":-!"
- latin:keyOutputText=":-! "
- latin:keyEdgeFlags="right" />
- </Row>
- <Row
- latin:rowEdgeFlags="bottom"
- >
- <Key
- latin:keyLabel=":-["
- latin:keyOutputText=":-[ "
- latin:keyEdgeFlags="left" />
- <Key
- latin:keyLabel="O:-)"
- latin:keyOutputText="O:-) " />
- <Key
- latin:keyLabel=":-\\"
- latin:keyOutputText=":-\\ " />
- <Key
- latin:keyLabel=":'("
- latin:keyOutputText=":'( " />
- <Key
- latin:keyLabel=":-D"
- latin:keyOutputText=":-D "
- latin:keyEdgeFlags="right" />
- </Row>
-</Keyboard>