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-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml
index 351950d..7e24e07 100644
--- a/java/res/xml-sr/kbd_qwerty.xml
+++ b/java/res/xml-sr/kbd_qwerty.xml
@@ -29,25 +29,45 @@
<Row>
<Key
android:keyLabel="љ"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="1"
android:keyEdgeFlags="left" />
<Key
- android:keyLabel="њ" />
+ android:keyLabel="њ"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="2" />
<Key
- android:keyLabel="е" />
+ android:keyLabel="е"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="3" />
<Key
- android:keyLabel="р" />
+ android:keyLabel="р"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="4" />
<Key
- android:keyLabel="т" />
+ android:keyLabel="т"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="5" />
<Key
- android:keyLabel="з" />
+ android:keyLabel="з"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="6" />
<Key
- android:keyLabel="у" />
+ android:keyLabel="у"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="7" />
<Key
- android:keyLabel="и" />
+ android:keyLabel="и"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="8" />
<Key
- android:keyLabel="о" />
+ android:keyLabel="о"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="9" />
<Key
- android:keyLabel="п" />
+ android:keyLabel="п"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="0" />
<Key
android:keyLabel="ш"
android:keyEdgeFlags="right" />
@@ -86,9 +106,9 @@
<Key
android:codes="@integer/key_shift"
android:keyIcon="@drawable/sym_keyboard_shift"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:keyWidth="11.75%p"
android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
android:isSticky="true"
android:keyEdgeFlags="left" />
<Key
@@ -108,11 +128,11 @@
<Key
android:codes="@integer/key_delete"
android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="11.75%p"
- android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:keyWidth="11.75%p"
+ android:isModifier="true"
android:isRepeatable="true"
- android:isModifier="true" />
+ android:keyEdgeFlags="right" />
</Row>
<Row
android:keyboardMode="@+id/mode_normal"
@@ -122,8 +142,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"
@@ -141,8 +161,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"
@@ -153,8 +173,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"
@@ -164,8 +184,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"
@@ -181,8 +201,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"
@@ -193,8 +213,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"
@@ -204,8 +224,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"
@@ -220,8 +240,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"
@@ -231,8 +251,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"
@@ -261,8 +281,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"
@@ -273,8 +293,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"
@@ -284,8 +304,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"
@@ -303,8 +323,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"
@@ -321,7 +341,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>