Add digit alternates
This also re-orders keyboard layout attribute and adds some
android:popupCharacters.
Bug: 2973749
Change-Id: I300fb4029a1844947731cb98a464d8d754cb03ef
diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml
index 7a6c1ea..1eabd67 100644
--- a/java/res/xml-fr/kbd_qwerty.xml
+++ b/java/res/xml-fr/kbd_qwerty.xml
@@ -32,15 +32,21 @@
android:popupCharacters="@string/alternates_for_a"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="z" />
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_z" />
<Key
android:keyLabel="e"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_e" />
<Key
- android:keyLabel="r" />
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_r" />
<Key
- android:keyLabel="t" />
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_t" />
<Key
android:keyLabel="y"
android:popupKeyboard="@xml/kbd_popup_template"
@@ -59,22 +65,30 @@
android:popupCharacters="@string/alternates_for_o" />
<Key
android:keyLabel="p"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p"
android:keyEdgeFlags="right" />
</Row>
<Row>
<Key
android:keyLabel="q"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_q"
android:keyEdgeFlags="left" />
<Key
android:keyLabel="s"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_s" />
<Key
- android:keyLabel="d" />
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_d" />
<Key
android:keyLabel="f" />
<Key
- android:keyLabel="g" />
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
<Key
android:keyLabel="h" />
<Key
@@ -82,7 +96,9 @@
<Key
android:keyLabel="k" />
<Key
- android:keyLabel="l" />
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_l" />
<Key
android:keyLabel="m"
android:keyEdgeFlags="right" />
@@ -91,13 +107,15 @@
<Key
android:codes="@integer/key_shift"
android:keyIcon="@drawable/sym_keyboard_shift"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:keyWidth="15%p"
android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:isSticky="true"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="w" />
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
<Key
android:keyLabel="x" />
<Key
@@ -105,24 +123,25 @@
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_c" />
<Key
- android:keyLabel="v" />
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_v" />
<Key
android:keyLabel="b" />
<Key
android:keyLabel="n"
android:popupKeyboard="@xml/kbd_popup_template"
android:popupCharacters="@string/alternates_for_n" />
- <!--Key android:codes="233,224,232,234" android:keyLabel="é"/ -->
<Key
android:keyLabel="\'" />
<Key
android:codes="@integer/key_delete"
android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="15%p"
- android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:keyWidth="15%p"
+ android:isModifier="true"
android:isRepeatable="true"
- android:isModifier="true" />
+ android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal"
@@ -132,8 +151,8 @@
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
- android:keyEdgeFlags="left"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
@@ -151,8 +170,8 @@
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
- android:isRepeatable="true"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
@@ -163,8 +182,8 @@
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
- android:keyEdgeFlags="right"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_url"
@@ -174,8 +193,8 @@
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
- android:keyEdgeFlags="left"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
@@ -191,8 +210,8 @@
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
- android:isRepeatable="true"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
@@ -203,8 +222,8 @@
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
- android:keyEdgeFlags="right"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_email"
@@ -214,8 +233,8 @@
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
- android:keyEdgeFlags="left"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
@@ -230,8 +249,8 @@
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
- android:isRepeatable="true"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
@@ -241,8 +260,8 @@
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="25%p"
- android:keyEdgeFlags="right"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_im"
@@ -252,8 +271,8 @@
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
- android:keyEdgeFlags="left"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
@@ -271,8 +290,8 @@
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
- android:isRepeatable="true"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
<Key
android:keyLabel="."
android:popupKeyboard="@xml/popup_punctuation"
@@ -283,8 +302,8 @@
android:keyOutputText=":-) "
android:popupKeyboard="@xml/popup_smileys"
android:keyWidth="25%p"
- android:keyEdgeFlags="right"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_webentry"
@@ -294,8 +313,8 @@
android:codes="@integer/key_symbol"
android:keyLabel="@string/label_symbol_key"
android:keyWidth="15%p"
- android:keyEdgeFlags="left"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="left" />
<Key
android:codes="@integer/key_settings"
android:keyIcon="@drawable/sym_keyboard_settings"
@@ -313,8 +332,8 @@
android:keyIcon="@drawable/sym_keyboard_space"
android:iconPreview="@drawable/sym_keyboard_feedback_space"
android:keyWidth="30%p"
- android:isRepeatable="true"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:isRepeatable="true" />
<Key
android:codes="@integer/key_tab"
android:keyIcon="@drawable/sym_keyboard_tab"
@@ -331,7 +350,7 @@
android:keyIcon="@drawable/sym_keyboard_return"
android:iconPreview="@drawable/sym_keyboard_feedback_return"
android:keyWidth="15%p"
- android:keyEdgeFlags="right"
- android:isModifier="true" />
+ android:isModifier="true"
+ android:keyEdgeFlags="right" />
</Row>
</Keyboard>