diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml
index 57b013a9d5ac1c296f24bd062666e5e51e772e1f..1f4c50f7b4de863feffa7b209f0f35081449a585 100644
--- a/java/res/xml-da/kbd_qwerty.xml
+++ b/java/res/xml-da/kbd_qwerty.xml
@@ -24,187 +24,372 @@
Just a copy of the Norwegian layout, with æ/ø switched.
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="9.09%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:codes="113" android:keyLabel="q"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
- <Key android:codes="101" android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€"/>
- <Key android:codes="114" android:keyLabel="r"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å™"/>
- <Key android:codes="116" android:keyLabel="t"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ"/>
- <Key android:codes="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿü"/>
- <Key android:codes="117" android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="úùûū"/>
- <Key android:codes="105" android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Ãìîï"/>
- <Key android:codes="111" android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="óòôõ"/>
- <Key android:codes="112" android:keyLabel="p"/>
- <Key android:keyLabel="Ã¥"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="113"
+ android:keyLabel="q"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="119"
+ android:keyLabel="w" />
+ <Key
+ android:codes="101"
+ android:keyLabel="e"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="éèêëę€" />
+ <Key
+ android:codes="114"
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å™" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ťþ" />
+ <Key
+ android:codes="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ýÿü" />
+ <Key
+ android:codes="117"
+ android:keyLabel="u"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="úùûū" />
+ <Key
+ android:codes="105"
+ android:keyLabel="i"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Ãìîï" />
+ <Key
+ android:codes="111"
+ android:keyLabel="o"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="óòôõ" />
+ <Key
+ android:codes="112"
+ android:keyLabel="p" />
+ <Key
+ android:keyLabel="Ã¥"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="97" android:keyLabel="a"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="áà âąã"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="115" android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß"/>
- <Key android:codes="100" android:keyLabel="d"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðÄ"/>
- <Key android:codes="102" android:keyLabel="f"/>
- <Key android:codes="103" android:keyLabel="g"/>
- <Key android:codes="104" android:keyLabel="h"/>
- <Key android:codes="106" android:keyLabel="j"/>
- <Key android:codes="107" android:keyLabel="k"/>
- <Key android:codes="108" android:keyLabel="l"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å‚"/>
- <Key android:keyLabel="æ"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ä"/>
- <Key android:keyLabel="ø"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="öœ"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="97"
+ android:keyLabel="a"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="áà âąã"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="115"
+ android:keyLabel="s"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="śšşß" />
+ <Key
+ android:codes="100"
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ðÄ" />
+ <Key
+ android:codes="102"
+ android:keyLabel="f" />
+ <Key
+ android:codes="103"
+ android:keyLabel="g" />
+ <Key
+ android:codes="104"
+ android:keyLabel="h" />
+ <Key
+ android:codes="106"
+ android:keyLabel="j" />
+ <Key
+ android:codes="107"
+ android:keyLabel="k" />
+ <Key
+ android:codes="108"
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å‚" />
+ <Key
+ android:keyLabel="æ"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ä" />
+ <Key
+ android:keyLabel="ø"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="öœ"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyWidth="10%p">
- <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="122" android:keyLabel="z"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż"/>
- <Key android:codes="120" android:keyLabel="x"/>
- <Key android:codes="99" android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćÄ"/>
- <Key android:codes="118" android:keyLabel="v"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w"/>
- <Key android:codes="98" android:keyLabel="b"/>
- <Key android:codes="110" android:keyLabel="n"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň"/>
- <Key android:codes="109" android:keyLabel="m"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true" android:isModifier="true"/>
+ <Row
+ android:keyWidth="10%p"
+ >
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_keyboard_shift"
+ android:keyWidth="15%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="źžż" />
+ <Key
+ android:codes="120"
+ android:keyLabel="x" />
+ <Key
+ android:codes="99"
+ android:keyLabel="c"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="çćÄ" />
+ <Key
+ android:codes="118"
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="w" />
+ <Key
+ android:codes="98"
+ android:keyLabel="b" />
+ <Key
+ android:codes="110"
+ android:keyLabel="n"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ńñň" />
+ <Key
+ android:codes="109"
+ android:keyLabel="m" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_keyboard_delete"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="\@" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="\@"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_keyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml
index bde77d6dcbd6e13212b28199a8408639a6aae859..d6ed24d8000abaccdf97d485d72a3b155e31c1b1 100644
--- a/java/res/xml-da/kbd_qwerty_black.xml
+++ b/java/res/xml-da/kbd_qwerty_black.xml
@@ -24,186 +24,341 @@
Just a copy of the Norwegian layout, with æ/ø switched.
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="9.09%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:codes="113" android:keyLabel="q"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
- <Key android:codes="101" android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€"/>
- <Key android:codes="114" android:keyLabel="r"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å™"/>
- <Key android:codes="116" android:keyLabel="t"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ"/>
- <Key android:codes="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿü"/>
- <Key android:codes="117" android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="úùûū"/>
- <Key android:codes="105" android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Ãìîï"/>
- <Key android:codes="111" android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="óòôõ"/>
- <Key android:codes="112" android:keyLabel="p"/>
- <Key android:keyLabel="Ã¥"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="113"
+ android:keyLabel="q"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="119"
+ android:keyLabel="w" />
+ <Key
+ android:codes="101"
+ android:keyLabel="e"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="éèêëę€" />
+ <Key
+ android:codes="114"
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å™" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ťþ" />
+ <Key
+ android:codes="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ýÿü" />
+ <Key
+ android:codes="117"
+ android:keyLabel="u"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="úùûū" />
+ <Key
+ android:codes="105"
+ android:keyLabel="i"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Ãìîï" />
+ <Key
+ android:codes="111"
+ android:keyLabel="o"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="óòôõ" />
+ <Key
+ android:codes="112"
+ android:keyLabel="p" />
+ <Key
+ android:keyLabel="Ã¥"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="97" android:keyLabel="a"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="áà âąã"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="115" android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß"/>
- <Key android:codes="100" android:keyLabel="d"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðÄ"/>
- <Key android:codes="102" android:keyLabel="f"/>
- <Key android:codes="103" android:keyLabel="g"/>
- <Key android:codes="104" android:keyLabel="h"/>
- <Key android:codes="106" android:keyLabel="j"/>
- <Key android:codes="107" android:keyLabel="k"/>
- <Key android:codes="108" android:keyLabel="l"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å‚"/>
- <Key android:keyLabel="æ"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ä"/>
- <Key android:keyLabel="ø"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="öœ"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="97"
+ android:keyLabel="a"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="áà âąã"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="115"
+ android:keyLabel="s"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="śšşß" />
+ <Key
+ android:codes="100"
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ðÄ" />
+ <Key
+ android:codes="102"
+ android:keyLabel="f" />
+ <Key
+ android:codes="103"
+ android:keyLabel="g" />
+ <Key
+ android:codes="104"
+ android:keyLabel="h" />
+ <Key
+ android:codes="106"
+ android:keyLabel="j" />
+ <Key
+ android:codes="107"
+ android:keyLabel="k" />
+ <Key
+ android:codes="108"
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å‚" />
+ <Key
+ android:keyLabel="æ"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ä" />
+ <Key
+ android:keyLabel="ø"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="öœ"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyWidth="10%p">
- <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="122" android:keyLabel="z"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż"/>
- <Key android:codes="120" android:keyLabel="x"/>
- <Key android:codes="99" android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćÄ"/>
- <Key android:codes="118" android:keyLabel="v"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w"/>
- <Key android:codes="98" android:keyLabel="b"/>
- <Key android:codes="110" android:keyLabel="n"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň"/>
- <Key android:codes="109" android:keyLabel="m"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ <Row
+ android:keyWidth="10%p"
+ >
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_bkeyboard_shift"
+ android:keyWidth="15%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="źžż" />
+ <Key
+ android:codes="120"
+ android:keyLabel="x" />
+ <Key
+ android:codes="99"
+ android:keyLabel="c"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="çćÄ" />
+ <Key
+ android:codes="118"
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="w" />
+ <Key
+ android:codes="98"
+ android:keyLabel="b" />
+ <Key
+ android:codes="110"
+ android:keyLabel="n"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ńñň" />
+ <Key
+ android:codes="109"
+ android:keyLabel="m" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true" />
</Row>
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="\@"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="\@" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_bkeyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml
index b4da9365ad68321088b04fddaeba1370e1cdc52f..f7e605c0ebe62917aef0a26cadb6fc1f242e6aff 100644
--- a/java/res/xml-fr/kbd_qwerty.xml
+++ b/java/res/xml-fr/kbd_qwerty.xml
@@ -18,175 +18,347 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:codes="97" android:keyLabel="a"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_a"
- android:keyEdgeFlags="left"/>
- <Key android:codes="122" android:keyLabel="z"/>
- <Key android:codes="101" android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_e"
- />
- <Key android:codes="114" android:keyLabel="r"/>
- <Key android:codes="116" android:keyLabel="t"/>
- <Key android:codes="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_y"
- />
- <Key android:codes="117" android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_u"
- />
- <Key android:codes="105" android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_i"
- />
- <Key android:codes="111" android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_o"
- />
- <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="97"
+ android:keyLabel="a"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_a"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z" />
+ <Key
+ android:codes="101"
+ android:keyLabel="e"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_e" />
+ <Key
+ android:codes="114"
+ android:keyLabel="r" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t" />
+ <Key
+ android:codes="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_y" />
+ <Key
+ android:codes="117"
+ android:keyLabel="u"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_u" />
+ <Key
+ android:codes="105"
+ android:keyLabel="i"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_i" />
+ <Key
+ android:codes="111"
+ android:keyLabel="o"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_o" />
+ <Key
+ android:codes="112"
+ android:keyLabel="p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
- <Key android:codes="115" android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_s"
- />
- <Key android:codes="100" android:keyLabel="d"/>
- <Key android:codes="102" android:keyLabel="f"/>
- <Key android:codes="103" android:keyLabel="g"/>
- <Key android:codes="104" android:keyLabel="h"/>
- <Key android:codes="106" android:keyLabel="j"/>
- <Key android:codes="107" android:keyLabel="k"/>
- <Key android:codes="108" android:keyLabel="l"/>
- <Key android:codes="109" android:keyLabel="m" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="113"
+ android:keyLabel="q"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="115"
+ android:keyLabel="s"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_s" />
+ <Key
+ android:codes="100"
+ android:keyLabel="d" />
+ <Key
+ android:codes="102"
+ android:keyLabel="f" />
+ <Key
+ android:codes="103"
+ android:keyLabel="g" />
+ <Key
+ android:codes="104"
+ android:keyLabel="h" />
+ <Key
+ android:codes="106"
+ android:keyLabel="j" />
+ <Key
+ android:codes="107"
+ android:keyLabel="k" />
+ <Key
+ android:codes="108"
+ android:keyLabel="l" />
+ <Key
+ android:codes="109"
+ android:keyLabel="m"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
- <Key android:codes="120" android:keyLabel="x"/>
- <Key android:codes="99" android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_c"
- />
- <Key android:codes="118" android:keyLabel="v"/>
- <Key android:codes="98" android:keyLabel="b"/>
- <Key android:codes="110" 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="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true" android:isModifier="true"/>
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_keyboard_shift"
+ android:keyWidth="15%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="119"
+ android:keyLabel="w" />
+ <Key
+ android:codes="120"
+ android:keyLabel="x" />
+ <Key
+ android:codes="99"
+ android:keyLabel="c"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_c" />
+ <Key
+ android:codes="118"
+ android:keyLabel="v" />
+ <Key
+ android:codes="98"
+ android:keyLabel="b" />
+ <Key
+ android:codes="110"
+ 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="-5"
+ android:keyIcon="@drawable/sym_keyboard_delete"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="\@" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="\@"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_keyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml
index c49d9821279b700b30060283c7bf926218c051ad..060998820b61d667e5311444c2433789db24f6db 100644
--- a/java/res/xml-fr/kbd_qwerty_black.xml
+++ b/java/res/xml-fr/kbd_qwerty_black.xml
@@ -18,175 +18,316 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:codes="97" android:keyLabel="a"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_a"
- android:keyEdgeFlags="left"/>
- <Key android:codes="122" android:keyLabel="z"/>
- <Key android:codes="101" android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_e"
- />
- <Key android:codes="114" android:keyLabel="r"/>
- <Key android:codes="116" android:keyLabel="t"/>
- <Key android:codes="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_y"
- />
- <Key android:codes="117" android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_u"
- />
- <Key android:codes="105" android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_i"
- />
- <Key android:codes="111" android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_o"
- />
- <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="97"
+ android:keyLabel="a"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_a"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z" />
+ <Key
+ android:codes="101"
+ android:keyLabel="e"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_e" />
+ <Key
+ android:codes="114"
+ android:keyLabel="r" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t" />
+ <Key
+ android:codes="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_y" />
+ <Key
+ android:codes="117"
+ android:keyLabel="u"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_u" />
+ <Key
+ android:codes="105"
+ android:keyLabel="i"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_i" />
+ <Key
+ android:codes="111"
+ android:keyLabel="o"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_o" />
+ <Key
+ android:codes="112"
+ android:keyLabel="p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/>
- <Key android:codes="115" android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_s"
- />
- <Key android:codes="100" android:keyLabel="d"/>
- <Key android:codes="102" android:keyLabel="f"/>
- <Key android:codes="103" android:keyLabel="g"/>
- <Key android:codes="104" android:keyLabel="h"/>
- <Key android:codes="106" android:keyLabel="j"/>
- <Key android:codes="107" android:keyLabel="k"/>
- <Key android:codes="108" android:keyLabel="l"/>
- <Key android:codes="109" android:keyLabel="m" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="113"
+ android:keyLabel="q"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="115"
+ android:keyLabel="s"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_s" />
+ <Key
+ android:codes="100"
+ android:keyLabel="d" />
+ <Key
+ android:codes="102"
+ android:keyLabel="f" />
+ <Key
+ android:codes="103"
+ android:keyLabel="g" />
+ <Key
+ android:codes="104"
+ android:keyLabel="h" />
+ <Key
+ android:codes="106"
+ android:keyLabel="j" />
+ <Key
+ android:codes="107"
+ android:keyLabel="k" />
+ <Key
+ android:codes="108"
+ android:keyLabel="l" />
+ <Key
+ android:codes="109"
+ android:keyLabel="m"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
- <Key android:codes="120" android:keyLabel="x"/>
- <Key android:codes="99" android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_c"
- />
- <Key android:codes="118" android:keyLabel="v"/>
- <Key android:codes="98" android:keyLabel="b"/>
- <Key android:codes="110" 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="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_bkeyboard_shift"
+ android:keyWidth="15%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="119"
+ android:keyLabel="w" />
+ <Key
+ android:codes="120"
+ android:keyLabel="x" />
+ <Key
+ android:codes="99"
+ android:keyLabel="c"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_c" />
+ <Key
+ android:codes="118"
+ android:keyLabel="v" />
+ <Key
+ android:codes="98"
+ android:keyLabel="b" />
+ <Key
+ android:codes="110"
+ 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="-5"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="\@"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="\@" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_bkeyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml
index c6b2056e216054136cd6e0763e47d91083b25a39..4287abb74200fd8c75983f7acf3c7fcf6db1793d 100755
--- a/java/res/xml-iw/kbd_qwerty.xml
+++ b/java/res/xml-iw/kbd_qwerty.xml
@@ -18,148 +18,298 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:keyLabel="ק"
- android:horizontalGap="5%p"
- android:keyEdgeFlags="left"/>
- <Key android:keyLabel="ר"/>
- <Key android:keyLabel="×"/>
- <Key android:keyLabel="ט"/>
- <Key android:keyLabel="ו"/>
- <Key android:keyLabel="ן"/>
- <Key android:keyLabel="×"/>
- <Key android:keyLabel="פ"/>
- <Key android:codes="-5"
- android:horizontalGap="1.25%p"
- android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="13.75%p" android:keyEdgeFlags="right"
+ <Key
+ android:keyLabel="ק"
+ android:horizontalGap="5%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="ר" />
+ <Key
+ android:keyLabel="×" />
+ <Key
+ android:keyLabel="ט" />
+ <Key
+ android:keyLabel="ו" />
+ <Key
+ android:keyLabel="ן" />
+ <Key
+ android:keyLabel="×" />
+ <Key
+ android:keyLabel="פ" />
+ <Key
+ android:codes="-5"
+ android:horizontalGap="1.25%p"
+ android:keyIcon="@drawable/sym_keyboard_delete"
+ android:keyWidth="13.75%p"
+ android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true" android:isModifier="true"/>
+ android:isRepeatable="true"
+ android:isModifier="true" />
</Row>
-
<Row>
- <Key android:keyLabel="ש" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="ד"/>
- <Key android:keyLabel="×’"/>
- <Key android:keyLabel="×›"/>
- <Key android:keyLabel="×¢"/>
- <Key android:keyLabel="×™"/>
- <Key android:keyLabel="×—"/>
- <Key android:keyLabel="ל"/>
- <Key android:keyLabel="ך"/>
- <Key android:keyLabel="×£" android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="ש"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="ד" />
+ <Key
+ android:keyLabel="×’" />
+ <Key
+ android:keyLabel="×›" />
+ <Key
+ android:keyLabel="×¢" />
+ <Key
+ android:keyLabel="×™" />
+ <Key
+ android:keyLabel="×—" />
+ <Key
+ android:keyLabel="ל" />
+ <Key
+ android:keyLabel="ך" />
+ <Key
+ android:keyLabel="×£"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:keyLabel="×–" android:horizontalGap="5%p" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="ס"/>
- <Key android:keyLabel="ב"/>
- <Key android:keyLabel="×”"/>
- <Key android:keyLabel="× "/>
- <Key android:keyLabel="מ"/>
- <Key android:keyLabel="צ"/>
- <Key android:keyLabel="ת"/>
- <Key android:keyLabel="×¥" android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="×–"
+ android:horizontalGap="5%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="ס" />
+ <Key
+ android:keyLabel="ב" />
+ <Key
+ android:keyLabel="×”" />
+ <Key
+ android:keyLabel="× " />
+ <Key
+ android:keyLabel="מ" />
+ <Key
+ android:keyLabel="צ" />
+ <Key
+ android:keyLabel="ת" />
+ <Key
+ android:keyLabel="×¥"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="\@" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="\@"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_keyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-</Keyboard>
-
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml
index 8b64c82adf8b7e2b4f04d6bb94d10fed96dcda7a..b924e47e21c935ff245b6a0c13cdbd605f40ef24 100755
--- a/java/res/xml-iw/kbd_qwerty_black.xml
+++ b/java/res/xml-iw/kbd_qwerty_black.xml
@@ -18,148 +18,267 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:keyLabel="ק"
- android:horizontalGap="5%p"
- android:keyEdgeFlags="left"/>
- <Key android:keyLabel="ר"/>
- <Key android:keyLabel="×"/>
- <Key android:keyLabel="ט"/>
- <Key android:keyLabel="ו"/>
- <Key android:keyLabel="ן"/>
- <Key android:keyLabel="×"/>
- <Key android:keyLabel="פ"/>
- <Key android:codes="-5"
- android:horizontalGap="1.25%p"
- android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:keyWidth="13.75%p" android:keyEdgeFlags="right"
+ <Key
+ android:keyLabel="ק"
+ android:horizontalGap="5%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="ר" />
+ <Key
+ android:keyLabel="×" />
+ <Key
+ android:keyLabel="ט" />
+ <Key
+ android:keyLabel="ו" />
+ <Key
+ android:keyLabel="ן" />
+ <Key
+ android:keyLabel="×" />
+ <Key
+ android:keyLabel="פ" />
+ <Key
+ android:codes="-5"
+ android:horizontalGap="1.25%p"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:keyWidth="13.75%p"
+ android:keyEdgeFlags="right"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ android:isRepeatable="true" />
</Row>
-
<Row>
- <Key android:keyLabel="ש" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="ד"/>
- <Key android:keyLabel="×’"/>
- <Key android:keyLabel="×›"/>
- <Key android:keyLabel="×¢"/>
- <Key android:keyLabel="×™"/>
- <Key android:keyLabel="×—"/>
- <Key android:keyLabel="ל"/>
- <Key android:keyLabel="ך"/>
- <Key android:keyLabel="×£" android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="ש"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="ד" />
+ <Key
+ android:keyLabel="×’" />
+ <Key
+ android:keyLabel="×›" />
+ <Key
+ android:keyLabel="×¢" />
+ <Key
+ android:keyLabel="×™" />
+ <Key
+ android:keyLabel="×—" />
+ <Key
+ android:keyLabel="ל" />
+ <Key
+ android:keyLabel="ך" />
+ <Key
+ android:keyLabel="×£"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:keyLabel="×–" android:horizontalGap="5%p" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="ס"/>
- <Key android:keyLabel="ב"/>
- <Key android:keyLabel="×”"/>
- <Key android:keyLabel="× "/>
- <Key android:keyLabel="מ"/>
- <Key android:keyLabel="צ"/>
- <Key android:keyLabel="ת"/>
- <Key android:keyLabel="×¥" android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="×–"
+ android:horizontalGap="5%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="ס" />
+ <Key
+ android:keyLabel="ב" />
+ <Key
+ android:keyLabel="×”" />
+ <Key
+ android:keyLabel="× " />
+ <Key
+ android:keyLabel="מ" />
+ <Key
+ android:keyLabel="צ" />
+ <Key
+ android:keyLabel="ת" />
+ <Key
+ android:keyLabel="×¥"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="\@"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="\@" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_bkeyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right" />
</Row>
-</Keyboard>
-
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
index 7bc02ebe4758d797f709155740a02c578aeb5ccd..7f023aca22905b7adf64e4edbb34b02d69ac4564 100644
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ b/java/res/xml-nb/kbd_qwerty.xml
@@ -24,185 +24,370 @@
Just a copy of the Swedish layout, with ä/æ and ö/ø switched.
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="9.09%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:codes="113" android:keyLabel="q"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
- <Key android:codes="101" android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€"/>
- <Key android:codes="114" android:keyLabel="r"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å™"/>
- <Key android:codes="116" android:keyLabel="t"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ"/>
- <Key android:codes="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿ"/>
- <Key android:codes="117" android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="üúùûū"/>
- <Key android:codes="105" android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Ãìîï"/>
- <Key android:codes="111" android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="öóòôõ"/>
- <Key android:codes="112" android:keyLabel="p"/>
- <Key android:keyLabel="Ã¥"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="113"
+ android:keyLabel="q"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="119"
+ android:keyLabel="w" />
+ <Key
+ android:codes="101"
+ android:keyLabel="e"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="éèêëę€" />
+ <Key
+ android:codes="114"
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å™" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ťþ" />
+ <Key
+ android:codes="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ýÿ" />
+ <Key
+ android:codes="117"
+ android:keyLabel="u"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="üúùûū" />
+ <Key
+ android:codes="105"
+ android:keyLabel="i"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Ãìîï" />
+ <Key
+ android:codes="111"
+ android:keyLabel="o"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="öóòôõ" />
+ <Key
+ android:codes="112"
+ android:keyLabel="p" />
+ <Key
+ android:keyLabel="Ã¥"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="97" android:keyLabel="a"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="äáà âąã"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="115" android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß"/>
- <Key android:codes="100" android:keyLabel="d"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðÄ"/>
- <Key android:codes="102" android:keyLabel="f"/>
- <Key android:codes="103" android:keyLabel="g"/>
- <Key android:codes="104" android:keyLabel="h"/>
- <Key android:codes="106" android:keyLabel="j"/>
- <Key android:codes="107" android:keyLabel="k"/>
- <Key android:codes="108" android:keyLabel="l"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å‚"/>
- <Key android:keyLabel="ø"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å“"/>
- <Key android:keyLabel="æ"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="97"
+ android:keyLabel="a"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="äáà âąã"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="115"
+ android:keyLabel="s"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="śšşß" />
+ <Key
+ android:codes="100"
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ðÄ" />
+ <Key
+ android:codes="102"
+ android:keyLabel="f" />
+ <Key
+ android:codes="103"
+ android:keyLabel="g" />
+ <Key
+ android:codes="104"
+ android:keyLabel="h" />
+ <Key
+ android:codes="106"
+ android:keyLabel="j" />
+ <Key
+ android:codes="107"
+ android:keyLabel="k" />
+ <Key
+ android:codes="108"
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å‚" />
+ <Key
+ android:keyLabel="ø"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å“" />
+ <Key
+ android:keyLabel="æ"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyWidth="10%p">
- <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="122" android:keyLabel="z"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż"/>
- <Key android:codes="120" android:keyLabel="x"/>
- <Key android:codes="99" android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćÄ"/>
- <Key android:codes="118" android:keyLabel="v"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w"/>
- <Key android:codes="98" android:keyLabel="b"/>
- <Key android:codes="110" android:keyLabel="n"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň"/>
- <Key android:codes="109" android:keyLabel="m"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true" android:isModifier="true"/>
+ <Row
+ android:keyWidth="10%p"
+ >
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_keyboard_shift"
+ android:keyWidth="15%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="źžż" />
+ <Key
+ android:codes="120"
+ android:keyLabel="x" />
+ <Key
+ android:codes="99"
+ android:keyLabel="c"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="çćÄ" />
+ <Key
+ android:codes="118"
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="w" />
+ <Key
+ android:codes="98"
+ android:keyLabel="b" />
+ <Key
+ android:codes="110"
+ android:keyLabel="n"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ńñň" />
+ <Key
+ android:codes="109"
+ android:keyLabel="m" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_keyboard_delete"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="\@" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="\@"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_keyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml
index e8745216500238dd99b22ee2b1c213ef83d1138b..d63d4ee78229932e43e85bf2f2b08242dad50ba7 100644
--- a/java/res/xml-nb/kbd_qwerty_black.xml
+++ b/java/res/xml-nb/kbd_qwerty_black.xml
@@ -24,185 +24,339 @@
Just a copy of the Swedish layout, with ä/æ and ö/ø switched.
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="9.09%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:codes="113" android:keyLabel="q"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
- <Key android:codes="101" android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€"/>
- <Key android:codes="114" android:keyLabel="r"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å™"/>
- <Key android:codes="116" android:keyLabel="t"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ"/>
- <Key android:codes="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿ"/>
- <Key android:codes="117" android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="üúùûū"/>
- <Key android:codes="105" android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Ãìîï"/>
- <Key android:codes="111" android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="öóòôõ"/>
- <Key android:codes="112" android:keyLabel="p"/>
- <Key android:keyLabel="Ã¥"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="113"
+ android:keyLabel="q"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="119"
+ android:keyLabel="w" />
+ <Key
+ android:codes="101"
+ android:keyLabel="e"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="éèêëę€" />
+ <Key
+ android:codes="114"
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å™" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ťþ" />
+ <Key
+ android:codes="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ýÿ" />
+ <Key
+ android:codes="117"
+ android:keyLabel="u"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="üúùûū" />
+ <Key
+ android:codes="105"
+ android:keyLabel="i"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Ãìîï" />
+ <Key
+ android:codes="111"
+ android:keyLabel="o"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="öóòôõ" />
+ <Key
+ android:codes="112"
+ android:keyLabel="p" />
+ <Key
+ android:keyLabel="Ã¥"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="97" android:keyLabel="a"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="äáà âąã"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="115" android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß"/>
- <Key android:codes="100" android:keyLabel="d"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðÄ"/>
- <Key android:codes="102" android:keyLabel="f"/>
- <Key android:codes="103" android:keyLabel="g"/>
- <Key android:codes="104" android:keyLabel="h"/>
- <Key android:codes="106" android:keyLabel="j"/>
- <Key android:codes="107" android:keyLabel="k"/>
- <Key android:codes="108" android:keyLabel="l"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å‚"/>
- <Key android:keyLabel="ø"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å“"/>
- <Key android:keyLabel="æ"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="97"
+ android:keyLabel="a"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="äáà âąã"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="115"
+ android:keyLabel="s"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="śšşß" />
+ <Key
+ android:codes="100"
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ðÄ" />
+ <Key
+ android:codes="102"
+ android:keyLabel="f" />
+ <Key
+ android:codes="103"
+ android:keyLabel="g" />
+ <Key
+ android:codes="104"
+ android:keyLabel="h" />
+ <Key
+ android:codes="106"
+ android:keyLabel="j" />
+ <Key
+ android:codes="107"
+ android:keyLabel="k" />
+ <Key
+ android:codes="108"
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å‚" />
+ <Key
+ android:keyLabel="ø"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å“" />
+ <Key
+ android:keyLabel="æ"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyWidth="10%p">
- <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="122" android:keyLabel="z"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż"/>
- <Key android:codes="120" android:keyLabel="x"/>
- <Key android:codes="99" android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćÄ"/>
- <Key android:codes="118" android:keyLabel="v"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w"/>
- <Key android:codes="98" android:keyLabel="b"/>
- <Key android:codes="110" android:keyLabel="n"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň"/>
- <Key android:codes="109" android:keyLabel="m"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ <Row
+ android:keyWidth="10%p"
+ >
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_bkeyboard_shift"
+ android:keyWidth="15%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="źžż" />
+ <Key
+ android:codes="120"
+ android:keyLabel="x" />
+ <Key
+ android:codes="99"
+ android:keyLabel="c"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="çćÄ" />
+ <Key
+ android:codes="118"
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="w" />
+ <Key
+ android:codes="98"
+ android:keyLabel="b" />
+ <Key
+ android:codes="110"
+ android:keyLabel="n"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ńñň" />
+ <Key
+ android:codes="109"
+ android:keyLabel="m" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="\@"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="\@" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_bkeyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml
index 41d23b7d53f4279601f8d91e14de6b73df43e221..3414b6beaaaf79694fe355cadb04de360570bcec 100755
--- a/java/res/xml-ru/kbd_qwerty.xml
+++ b/java/res/xml-ru/kbd_qwerty.xml
@@ -18,160 +18,320 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="9.09%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:keyLabel="й" android:keyWidth="8.75%p"
- android:keyEdgeFlags="left"/>
- <Key android:keyLabel="ц"/>
- <Key android:keyLabel="у"/>
- <Key android:keyLabel="к"/>
- <Key android:keyLabel="е"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Ñ‘" />
- <Key android:keyLabel="н"/>
- <Key android:keyLabel="г"/>
- <Key android:keyLabel="ш"/>
- <Key android:keyLabel="щ"/>
- <Key android:keyLabel="з"/>
- <Key android:keyLabel="Ñ…" android:keyWidth="8.75%p"
- android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="й"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="ц" />
+ <Key
+ android:keyLabel="у" />
+ <Key
+ android:keyLabel="к" />
+ <Key
+ android:keyLabel="е"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Ñ‘" />
+ <Key
+ android:keyLabel="н" />
+ <Key
+ android:keyLabel="г" />
+ <Key
+ android:keyLabel="ш" />
+ <Key
+ android:keyLabel="щ" />
+ <Key
+ android:keyLabel="з" />
+ <Key
+ android:keyLabel="Ñ…"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:keyLabel="Ñ„" android:keyWidth="8.75%p"
- android:keyEdgeFlags="left"/>
- <Key android:keyLabel="Ñ‹"/>
- <Key android:keyLabel="в"/>
- <Key android:keyLabel="а"/>
- <Key android:keyLabel="п"/>
- <Key android:keyLabel="Ñ€"/>
- <Key android:keyLabel="о"/>
- <Key android:keyLabel="л"/>
- <Key android:keyLabel="д"/>
- <Key android:keyLabel="ж"/>
- <Key android:keyLabel="Ñ" android:keyWidth="8.75%p"
- android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="Ñ„"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="Ñ‹" />
+ <Key
+ android:keyLabel="в" />
+ <Key
+ android:keyLabel="а" />
+ <Key
+ android:keyLabel="п" />
+ <Key
+ android:keyLabel="Ñ€" />
+ <Key
+ android:keyLabel="о" />
+ <Key
+ android:keyLabel="л" />
+ <Key
+ android:keyLabel="д" />
+ <Key
+ android:keyLabel="ж" />
+ <Key
+ android:keyLabel="Ñ"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyWidth="8.5%p">
- <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
- android:keyWidth="11.75%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="Ñ"/>
- <Key android:keyLabel="ч"/>
- <Key android:keyLabel="Ñ"/>
- <Key android:keyLabel="м"/>
- <Key android:keyLabel="и"/>
- <Key android:keyLabel="Ñ‚"/>
- <Key android:keyLabel="ь"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ÑŠ" />
- <Key android:keyLabel="б"/>
- <Key android:keyLabel="ÑŽ"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="11.75%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true" android:isModifier="true"/>
+ <Row
+ android:keyWidth="8.5%p"
+ >
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_keyboard_shift"
+ android:keyWidth="11.75%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="Ñ" />
+ <Key
+ android:keyLabel="ч" />
+ <Key
+ android:keyLabel="Ñ" />
+ <Key
+ android:keyLabel="м" />
+ <Key
+ android:keyLabel="и" />
+ <Key
+ android:keyLabel="Ñ‚" />
+ <Key
+ android:keyLabel="ь"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ÑŠ" />
+ <Key
+ android:keyLabel="б" />
+ <Key
+ android:keyLabel="ÑŽ" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_keyboard_delete"
+ android:keyWidth="11.75%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="\@" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="\@"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_keyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-</Keyboard>
-
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml
index 241c8524e968d4221e78c390d781b00073787a83..ccfec8612b8a2e54cd384b4c418c273bb45a0fdd 100755
--- a/java/res/xml-ru/kbd_qwerty_black.xml
+++ b/java/res/xml-ru/kbd_qwerty_black.xml
@@ -18,159 +18,289 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="9.09%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:keyLabel="й" android:keyWidth="8.75%p"
- android:keyEdgeFlags="left"/>
- <Key android:keyLabel="ц"/>
- <Key android:keyLabel="у"/>
- <Key android:keyLabel="к"/>
- <Key android:keyLabel="е"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Ñ‘" />
- <Key android:keyLabel="н"/>
- <Key android:keyLabel="г"/>
- <Key android:keyLabel="ш"/>
- <Key android:keyLabel="щ"/>
- <Key android:keyLabel="з"/>
- <Key android:keyLabel="Ñ…" android:keyWidth="8.75%p"
- android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="й"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="ц" />
+ <Key
+ android:keyLabel="у" />
+ <Key
+ android:keyLabel="к" />
+ <Key
+ android:keyLabel="е"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Ñ‘" />
+ <Key
+ android:keyLabel="н" />
+ <Key
+ android:keyLabel="г" />
+ <Key
+ android:keyLabel="ш" />
+ <Key
+ android:keyLabel="щ" />
+ <Key
+ android:keyLabel="з" />
+ <Key
+ android:keyLabel="Ñ…"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:keyLabel="Ñ„" android:keyWidth="8.75%p"
- android:keyEdgeFlags="left"/>
- <Key android:keyLabel="Ñ‹"/>
- <Key android:keyLabel="в"/>
- <Key android:keyLabel="а"/>
- <Key android:keyLabel="п"/>
- <Key android:keyLabel="Ñ€"/>
- <Key android:keyLabel="о"/>
- <Key android:keyLabel="л"/>
- <Key android:keyLabel="д"/>
- <Key android:keyLabel="ж"/>
- <Key android:keyLabel="Ñ" android:keyWidth="8.75%p"
- android:keyEdgeFlags="right"/>
+ <Key
+ android:keyLabel="Ñ„"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="Ñ‹" />
+ <Key
+ android:keyLabel="в" />
+ <Key
+ android:keyLabel="а" />
+ <Key
+ android:keyLabel="п" />
+ <Key
+ android:keyLabel="Ñ€" />
+ <Key
+ android:keyLabel="о" />
+ <Key
+ android:keyLabel="л" />
+ <Key
+ android:keyLabel="д" />
+ <Key
+ android:keyLabel="ж" />
+ <Key
+ android:keyLabel="Ñ"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyWidth="8.5%p">
- <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift"
- android:keyWidth="11.75%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="Ñ"/>
- <Key android:keyLabel="ч"/>
- <Key android:keyLabel="Ñ"/>
- <Key android:keyLabel="м"/>
- <Key android:keyLabel="и"/>
- <Key android:keyLabel="Ñ‚"/>
- <Key android:keyLabel="ь"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ÑŠ" />
- <Key android:keyLabel="б"/>
- <Key android:keyLabel="ÑŽ"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:keyWidth="11.75%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ <Row
+ android:keyWidth="8.5%p"
+ >
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_bkeyboard_shift"
+ android:keyWidth="11.75%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="Ñ" />
+ <Key
+ android:keyLabel="ч" />
+ <Key
+ android:keyLabel="Ñ" />
+ <Key
+ android:keyLabel="м" />
+ <Key
+ android:keyLabel="и" />
+ <Key
+ android:keyLabel="Ñ‚" />
+ <Key
+ android:keyLabel="ь"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ÑŠ" />
+ <Key
+ android:keyLabel="б" />
+ <Key
+ android:keyLabel="ÑŽ" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:keyWidth="11.75%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="\@"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="\@" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_bkeyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml
index 78852fc22405b3d244225bf9cf59b019237c4caf..e8d12143a8d6fd18c11182d97bcae035cb4a0f68 100644
--- a/java/res/xml-sr/kbd_qwerty.xml
+++ b/java/res/xml-sr/kbd_qwerty.xml
@@ -19,154 +19,310 @@
-->
<!-- Serbian keyboard layout, based on the X11 layout for Serbian -->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="9.09%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:keyLabel="Ñ™"
- android:keyEdgeFlags="left" />
- <Key android:keyLabel="Ñš" />
- <Key android:keyLabel="е" />
- <Key android:keyLabel="Ñ€" />
- <Key android:keyLabel="Ñ‚" />
- <Key android:keyLabel="з" />
- <Key android:keyLabel="у" />
- <Key android:keyLabel="и" />
- <Key android:keyLabel="о" />
- <Key android:keyLabel="п" />
- <Key android:keyLabel="ш"
- android:keyEdgeFlags="right" />
+ <Key
+ android:keyLabel="Ñ™"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="Ñš" />
+ <Key
+ android:keyLabel="е" />
+ <Key
+ android:keyLabel="Ñ€" />
+ <Key
+ android:keyLabel="Ñ‚" />
+ <Key
+ android:keyLabel="з" />
+ <Key
+ android:keyLabel="у" />
+ <Key
+ android:keyLabel="и" />
+ <Key
+ android:keyLabel="о" />
+ <Key
+ android:keyLabel="п" />
+ <Key
+ android:keyLabel="ш"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:keyLabel="а"
- android:keyEdgeFlags="left" />
- <Key android:keyLabel="Ñ" />
- <Key android:keyLabel="д" />
- <Key android:keyLabel="Ñ„" />
- <Key android:keyLabel="г" />
- <Key android:keyLabel="Ñ…" />
- <Key android:keyLabel="ј" />
- <Key android:keyLabel="к" />
- <Key android:keyLabel="л" />
- <Key android:keyLabel="ч" />
- <Key android:keyLabel="Ñ›" />
- <Key android:keyLabel="Ñ’"
- android:keyEdgeFlags="right" />
+ <Key
+ android:keyLabel="а"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="Ñ" />
+ <Key
+ android:keyLabel="д" />
+ <Key
+ android:keyLabel="Ñ„" />
+ <Key
+ android:keyLabel="г" />
+ <Key
+ android:keyLabel="Ñ…" />
+ <Key
+ android:keyLabel="ј" />
+ <Key
+ android:keyLabel="к" />
+ <Key
+ android:keyLabel="л" />
+ <Key
+ android:keyLabel="ч" />
+ <Key
+ android:keyLabel="Ñ›" />
+ <Key
+ android:keyLabel="Ñ’"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyWidth="8.5%p">
- <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
- android:keyWidth="11.75%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="ж" />
- <Key android:keyLabel="ÑŸ" />
- <Key android:keyLabel="ц" />
- <Key android:keyLabel="в" />
- <Key android:keyLabel="б" />
- <Key android:keyLabel="н" />
- <Key android:keyLabel="м" />
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="11.75%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true" android:isModifier="true"/>
+ <Row
+ android:keyWidth="8.5%p"
+ >
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_keyboard_shift"
+ android:keyWidth="11.75%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="ж" />
+ <Key
+ android:keyLabel="ÑŸ" />
+ <Key
+ android:keyLabel="ц" />
+ <Key
+ android:keyLabel="в" />
+ <Key
+ android:keyLabel="б" />
+ <Key
+ android:keyLabel="н" />
+ <Key
+ android:keyLabel="м" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_keyboard_delete"
+ android:keyWidth="11.75%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="\@" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="\@"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_keyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml
index c61e0ce2ac27f0376df41075d0af6507af6be916..2bef4505b99cdff8017c03d83a1ce6dbce022a86 100644
--- a/java/res/xml-sr/kbd_qwerty_black.xml
+++ b/java/res/xml-sr/kbd_qwerty_black.xml
@@ -19,154 +19,279 @@
-->
<!-- Serbian keyboard layout, based on the X11 layout for Serbian -->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="9.09%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:keyLabel="Ñ™"
- android:keyEdgeFlags="left" />
- <Key android:keyLabel="Ñš" />
- <Key android:keyLabel="е" />
- <Key android:keyLabel="Ñ€" />
- <Key android:keyLabel="Ñ‚" />
- <Key android:keyLabel="з" />
- <Key android:keyLabel="у" />
- <Key android:keyLabel="и" />
- <Key android:keyLabel="о" />
- <Key android:keyLabel="п" />
- <Key android:keyLabel="ш"
- android:keyEdgeFlags="right" />
+ <Key
+ android:keyLabel="Ñ™"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="Ñš" />
+ <Key
+ android:keyLabel="е" />
+ <Key
+ android:keyLabel="Ñ€" />
+ <Key
+ android:keyLabel="Ñ‚" />
+ <Key
+ android:keyLabel="з" />
+ <Key
+ android:keyLabel="у" />
+ <Key
+ android:keyLabel="и" />
+ <Key
+ android:keyLabel="о" />
+ <Key
+ android:keyLabel="п" />
+ <Key
+ android:keyLabel="ш"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:keyLabel="а"
- android:keyEdgeFlags="left" />
- <Key android:keyLabel="Ñ" />
- <Key android:keyLabel="д" />
- <Key android:keyLabel="Ñ„" />
- <Key android:keyLabel="г" />
- <Key android:keyLabel="Ñ…" />
- <Key android:keyLabel="ј" />
- <Key android:keyLabel="к" />
- <Key android:keyLabel="л" />
- <Key android:keyLabel="ч" />
- <Key android:keyLabel="Ñ›" />
- <Key android:keyLabel="Ñ’"
- android:keyEdgeFlags="right" />
+ <Key
+ android:keyLabel="а"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="Ñ" />
+ <Key
+ android:keyLabel="д" />
+ <Key
+ android:keyLabel="Ñ„" />
+ <Key
+ android:keyLabel="г" />
+ <Key
+ android:keyLabel="Ñ…" />
+ <Key
+ android:keyLabel="ј" />
+ <Key
+ android:keyLabel="к" />
+ <Key
+ android:keyLabel="л" />
+ <Key
+ android:keyLabel="ч" />
+ <Key
+ android:keyLabel="Ñ›" />
+ <Key
+ android:keyLabel="Ñ’"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyWidth="8.5%p">
- <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift"
- android:keyWidth="11.75%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:keyLabel="ж" />
- <Key android:keyLabel="ÑŸ" />
- <Key android:keyLabel="ц" />
- <Key android:keyLabel="в" />
- <Key android:keyLabel="б" />
- <Key android:keyLabel="н" />
- <Key android:keyLabel="м" />
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:keyWidth="11.75%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ <Row
+ android:keyWidth="8.5%p"
+ >
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_bkeyboard_shift"
+ android:keyWidth="11.75%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:keyLabel="ж" />
+ <Key
+ android:keyLabel="ÑŸ" />
+ <Key
+ android:keyLabel="ц" />
+ <Key
+ android:keyLabel="в" />
+ <Key
+ android:keyLabel="б" />
+ <Key
+ android:keyLabel="н" />
+ <Key
+ android:keyLabel="м" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:keyWidth="11.75%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="\@"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="\@" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_bkeyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml
index bd5c67631db2a4de12b601beafbc2316c512e365..e44c67e31d61971992f2d1d2bec76579b429c8e1 100644
--- a/java/res/xml-sv/kbd_qwerty.xml
+++ b/java/res/xml-sv/kbd_qwerty.xml
@@ -26,187 +26,371 @@
Local additions: ۧ
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="9.09%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:codes="113" android:keyLabel="q"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
- <Key android:codes="101" android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€"/>
- <Key android:codes="114" android:keyLabel="r"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å™"/>
- <Key android:codes="116" android:keyLabel="t"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ"/>
- <Key android:codes="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿü"/>
- <Key android:codes="117" android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="úùûū"/>
- <Key android:codes="105" android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Ãìîï"/>
- <Key android:codes="111" android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="óòôõ"/>
- <Key android:codes="112" android:keyLabel="p"/>
- <Key android:keyLabel="Ã¥"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="113"
+ android:keyLabel="q"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="119"
+ android:keyLabel="w" />
+ <Key
+ android:codes="101"
+ android:keyLabel="e"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="éèêëę€" />
+ <Key
+ android:codes="114"
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å™" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ťþ" />
+ <Key
+ android:codes="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ýÿü" />
+ <Key
+ android:codes="117"
+ android:keyLabel="u"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="úùûū" />
+ <Key
+ android:codes="105"
+ android:keyLabel="i"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Ãìîï" />
+ <Key
+ android:codes="111"
+ android:keyLabel="o"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="óòôõ" />
+ <Key
+ android:codes="112"
+ android:keyLabel="p" />
+ <Key
+ android:keyLabel="Ã¥"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="97" android:keyLabel="a"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="áà âąã"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="115" android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß"/>
- <Key android:codes="100" android:keyLabel="d"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðÄ"/>
- <Key android:codes="102" android:keyLabel="f"/>
- <Key android:codes="103" android:keyLabel="g"/>
- <Key android:codes="104" android:keyLabel="h"/>
- <Key android:codes="106" android:keyLabel="j"/>
- <Key android:codes="107" android:keyLabel="k"/>
- <Key android:codes="108" android:keyLabel="l"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å‚"/>
- <Key android:keyLabel="ö"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="øœ"/>
- <Key android:keyLabel="ä"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="æ"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="97"
+ android:keyLabel="a"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="áà âąã"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="115"
+ android:keyLabel="s"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="śšşß" />
+ <Key
+ android:codes="100"
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ðÄ" />
+ <Key
+ android:codes="102"
+ android:keyLabel="f" />
+ <Key
+ android:codes="103"
+ android:keyLabel="g" />
+ <Key
+ android:codes="104"
+ android:keyLabel="h" />
+ <Key
+ android:codes="106"
+ android:keyLabel="j" />
+ <Key
+ android:codes="107"
+ android:keyLabel="k" />
+ <Key
+ android:codes="108"
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å‚" />
+ <Key
+ android:keyLabel="ö"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="øœ" />
+ <Key
+ android:keyLabel="ä"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="æ"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyWidth="10%p">
- <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="122" android:keyLabel="z"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż"/>
- <Key android:codes="120" android:keyLabel="x"/>
- <Key android:codes="99" android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćÄ"/>
- <Key android:codes="118" android:keyLabel="v"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w"/>
- <Key android:codes="98" android:keyLabel="b"/>
- <Key android:codes="110" android:keyLabel="n"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň"/>
- <Key android:codes="109" android:keyLabel="m"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ <Row
+ android:keyWidth="10%p"
+ >
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_keyboard_shift"
+ android:keyWidth="15%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="źžż" />
+ <Key
+ android:codes="120"
+ android:keyLabel="x" />
+ <Key
+ android:codes="99"
+ android:keyLabel="c"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="çćÄ" />
+ <Key
+ android:codes="118"
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="w" />
+ <Key
+ android:codes="98"
+ android:keyLabel="b" />
+ <Key
+ android:codes="110"
+ android:keyLabel="n"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ńñň" />
+ <Key
+ android:codes="109"
+ android:keyLabel="m" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_keyboard_delete"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="\@" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="\@"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_keyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml
index dccc63a65e957b6102f7ac230fddc29c73d4c5d5..dc653afbe6ca94fd4a93cef00f28f331e331cd36 100644
--- a/java/res/xml-sv/kbd_qwerty_black.xml
+++ b/java/res/xml-sv/kbd_qwerty_black.xml
@@ -26,187 +26,341 @@
Local additions: ۧ
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="9.09%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:codes="113" android:keyLabel="q"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="119" android:keyLabel="w"/>
- <Key android:codes="101" android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="éèêëę€"/>
- <Key android:codes="114" android:keyLabel="r"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å™"/>
- <Key android:codes="116" android:keyLabel="t"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ťþ"/>
- <Key android:codes="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ýÿü"/>
- <Key android:codes="117" android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="úùûū"/>
- <Key android:codes="105" android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Ãìîï"/>
- <Key android:codes="111" android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="óòôõ"/>
- <Key android:codes="112" android:keyLabel="p"/>
- <Key android:keyLabel="Ã¥"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="113"
+ android:keyLabel="q"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="119"
+ android:keyLabel="w" />
+ <Key
+ android:codes="101"
+ android:keyLabel="e"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="éèêëę€" />
+ <Key
+ android:codes="114"
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å™" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ťþ" />
+ <Key
+ android:codes="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ýÿü" />
+ <Key
+ android:codes="117"
+ android:keyLabel="u"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="úùûū" />
+ <Key
+ android:codes="105"
+ android:keyLabel="i"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Ãìîï" />
+ <Key
+ android:codes="111"
+ android:keyLabel="o"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="óòôõ" />
+ <Key
+ android:codes="112"
+ android:keyLabel="p" />
+ <Key
+ android:keyLabel="Ã¥"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="97" android:keyLabel="a"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="áà âąã"
- android:keyWidth="8.75%p" android:keyEdgeFlags="left"/>
- <Key android:codes="115" android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="śšşß"/>
- <Key android:codes="100" android:keyLabel="d"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ðÄ"/>
- <Key android:codes="102" android:keyLabel="f"/>
- <Key android:codes="103" android:keyLabel="g"/>
- <Key android:codes="104" android:keyLabel="h"/>
- <Key android:codes="106" android:keyLabel="j"/>
- <Key android:codes="107" android:keyLabel="k"/>
- <Key android:codes="108" android:keyLabel="l"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="Å‚"/>
- <Key android:keyLabel="ö"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="øœ"/>
- <Key android:keyLabel="ä"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="æ"
- android:keyWidth="8.75%p" android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="97"
+ android:keyLabel="a"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="áà âąã"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="115"
+ android:keyLabel="s"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="śšşß" />
+ <Key
+ android:codes="100"
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ðÄ" />
+ <Key
+ android:codes="102"
+ android:keyLabel="f" />
+ <Key
+ android:codes="103"
+ android:keyLabel="g" />
+ <Key
+ android:codes="104"
+ android:keyLabel="h" />
+ <Key
+ android:codes="106"
+ android:keyLabel="j" />
+ <Key
+ android:codes="107"
+ android:keyLabel="k" />
+ <Key
+ android:codes="108"
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="Å‚" />
+ <Key
+ android:keyLabel="ö"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="øœ" />
+ <Key
+ android:keyLabel="ä"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="æ"
+ android:keyWidth="8.75%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyWidth="10%p">
- <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="122" android:keyLabel="z"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="źžż"/>
- <Key android:codes="120" android:keyLabel="x"/>
- <Key android:codes="99" android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="çćÄ"/>
- <Key android:codes="118" android:keyLabel="v"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="w"/>
- <Key android:codes="98" android:keyLabel="b"/>
- <Key android:codes="110" android:keyLabel="n"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="ńñň"/>
- <Key android:codes="109" android:keyLabel="m"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ <Row
+ android:keyWidth="10%p"
+ >
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_bkeyboard_shift"
+ android:keyWidth="15%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="źžż" />
+ <Key
+ android:codes="120"
+ android:keyLabel="x" />
+ <Key
+ android:codes="99"
+ android:keyLabel="c"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="çćÄ" />
+ <Key
+ android:codes="118"
+ android:keyLabel="v"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="w" />
+ <Key
+ android:codes="98"
+ android:keyLabel="b" />
+ <Key
+ android:codes="110"
+ android:keyLabel="n"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="ńñň" />
+ <Key
+ android:codes="109"
+ android:keyLabel="m" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="\@"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="\@" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_bkeyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index c75e27afbf39afe2eede3ef0ef9096403c581bbd..c141f9640ac40d2b8275a64c2274c36fb1085830 100755
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -21,198 +21,363 @@
<!-- TODO: Add settings key to other languages -->
<!-- TODO: Add modifier attr to functional keys in other languages -->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_q"
- />
- <Key android:codes="119" android:keyLabel="w"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_w"
- />
- <Key android:codes="101" android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_e"
- />
- <Key android:codes="114" android:keyLabel="r"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_r"
- />
- <Key android:codes="116" android:keyLabel="t"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_t"
- />
- <Key android:codes="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_y"
- />
- <Key android:codes="117" android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_u"
- />
- <Key android:codes="105" android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_i"
- />
- <Key android:codes="111" android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_o"
- />
- <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_p"
- />
+ <Key
+ android:codes="113"
+ android:keyLabel="q"
+ android:keyEdgeFlags="left"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_q" />
+ <Key
+ android:codes="119"
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ <Key
+ android:codes="101"
+ android:keyLabel="e"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_e" />
+ <Key
+ android:codes="114"
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_r" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_t" />
+ <Key
+ android:codes="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_y" />
+ <Key
+ android:codes="117"
+ android:keyLabel="u"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_u" />
+ <Key
+ android:codes="105"
+ android:keyLabel="i"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_i" />
+ <Key
+ android:codes="111"
+ android:keyLabel="o"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_o" />
+ <Key
+ android:codes="112"
+ android:keyLabel="p"
+ android:keyEdgeFlags="right"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p" />
</Row>
-
<Row>
- <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_a"
- android:keyEdgeFlags="left"/>
- <Key android:codes="115" android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_s"
- />
- <Key android:codes="100" android:keyLabel="d"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_d"/>
- <Key android:codes="102" android:keyLabel="f"/>
- <Key android:codes="103" android:keyLabel="g"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_g"
- />
- <Key android:codes="104" android:keyLabel="h"/>
- <Key android:codes="106" android:keyLabel="j"/>
- <Key android:codes="107" android:keyLabel="k"/>
- <Key android:codes="108" android:keyLabel="l"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_l"
- android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="97"
+ android:keyLabel="a"
+ android:horizontalGap="5%p"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_a"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="115"
+ android:keyLabel="s"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_s" />
+ <Key
+ android:codes="100"
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_d" />
+ <Key
+ android:codes="102"
+ android:keyLabel="f" />
+ <Key
+ android:codes="103"
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
+ <Key
+ android:codes="104"
+ android:keyLabel="h" />
+ <Key
+ android:codes="106"
+ android:keyLabel="j" />
+ <Key
+ android:codes="107"
+ android:keyLabel="k" />
+ <Key
+ android:codes="108"
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_l"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="122" android:keyLabel="z"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_z"/>
- <Key android:codes="120" android:keyLabel="x"/>
- <Key android:codes="99" android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_c"
- />
- <Key android:codes="118" android:keyLabel="v"/>
- <Key android:codes="98" android:keyLabel="b"/>
- <Key android:codes="110" android:keyLabel="n"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_n"
- />
- <Key android:codes="109" android:keyLabel="m"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true" android:isModifier="true"/>
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_keyboard_shift"
+ android:keyWidth="15%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_z" />
+ <Key
+ android:codes="120"
+ android:keyLabel="x" />
+ <Key
+ android:codes="99"
+ android:keyLabel="c"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_c" />
+ <Key
+ android:codes="118"
+ android:keyLabel="v" />
+ <Key
+ android:codes="98"
+ android:keyLabel="b" />
+ <Key
+ android:codes="110"
+ android:keyLabel="n"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_n" />
+ <Key
+ android:codes="109"
+ android:keyLabel="m" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_keyboard_delete"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="\@" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="\@"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p" android:isModifier="true"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_keyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_keyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_keyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true"
+ android:isModifier="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_keyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p"
+ android:isModifier="true" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_keyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:isModifier="true" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml
index 06bc102bb6656a1869d49239c921cf0abc4968f6..529e7ade04e0b8dd3bc6782bd9a5a0f85cdc5267 100755
--- a/java/res/xml/kbd_qwerty_black.xml
+++ b/java/res/xml/kbd_qwerty_black.xml
@@ -18,198 +18,332 @@
*/
-->
-<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+<Keyboard
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:keyWidth="10%p"
android:horizontalGap="0px"
android:verticalGap="0px"
android:keyHeight="@dimen/key_height"
- >
-
+>
<Row>
- <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_q"
- />
- <Key android:codes="119" android:keyLabel="w"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_w"
- />
- <Key android:codes="101" android:keyLabel="e"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_e"
- />
- <Key android:codes="114" android:keyLabel="r"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_r"
- />
- <Key android:codes="116" android:keyLabel="t"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_t"
- />
- <Key android:codes="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_y"
- />
- <Key android:codes="117" android:keyLabel="u"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_u"
- />
- <Key android:codes="105" android:keyLabel="i"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_i"
- />
- <Key android:codes="111" android:keyLabel="o"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_o"
- />
- <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_p"
- />
+ <Key
+ android:codes="113"
+ android:keyLabel="q"
+ android:keyEdgeFlags="left"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_q" />
+ <Key
+ android:codes="119"
+ android:keyLabel="w"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_w" />
+ <Key
+ android:codes="101"
+ android:keyLabel="e"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_e" />
+ <Key
+ android:codes="114"
+ android:keyLabel="r"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_r" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_t" />
+ <Key
+ android:codes="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_y" />
+ <Key
+ android:codes="117"
+ android:keyLabel="u"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_u" />
+ <Key
+ android:codes="105"
+ android:keyLabel="i"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_i" />
+ <Key
+ android:codes="111"
+ android:keyLabel="o"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_o" />
+ <Key
+ android:codes="112"
+ android:keyLabel="p"
+ android:keyEdgeFlags="right"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_p" />
</Row>
-
<Row>
- <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_a"
- android:keyEdgeFlags="left"/>
- <Key android:codes="115" android:keyLabel="s"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_s"
- />
- <Key android:codes="100" android:keyLabel="d"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_d"/>
- <Key android:codes="102" android:keyLabel="f"/>
- <Key android:codes="103" android:keyLabel="g"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_g"
- />
- <Key android:codes="104" android:keyLabel="h"/>
- <Key android:codes="106" android:keyLabel="j"/>
- <Key android:codes="107" android:keyLabel="k"/>
- <Key android:codes="108" android:keyLabel="l"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_l"
- android:keyEdgeFlags="right"/>
+ <Key
+ android:codes="97"
+ android:keyLabel="a"
+ android:horizontalGap="5%p"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_a"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="115"
+ android:keyLabel="s"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_s" />
+ <Key
+ android:codes="100"
+ android:keyLabel="d"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_d" />
+ <Key
+ android:codes="102"
+ android:keyLabel="f" />
+ <Key
+ android:codes="103"
+ android:keyLabel="g"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_g" />
+ <Key
+ android:codes="104"
+ android:keyLabel="h" />
+ <Key
+ android:codes="106"
+ android:keyLabel="j" />
+ <Key
+ android:codes="107"
+ android:keyLabel="k" />
+ <Key
+ android:codes="108"
+ android:keyLabel="l"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_l"
+ android:keyEdgeFlags="right" />
</Row>
-
<Row>
- <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift"
- android:keyWidth="15%p" android:isModifier="true"
- android:iconPreview="@drawable/sym_keyboard_feedback_shift"
- android:isSticky="true" android:keyEdgeFlags="left"/>
- <Key android:codes="122" android:keyLabel="z"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_z"/>
- <Key android:codes="120" android:keyLabel="x"/>
- <Key android:codes="99" android:keyLabel="c"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_c"
- />
- <Key android:codes="118" android:keyLabel="v"/>
- <Key android:codes="98" android:keyLabel="b"/>
- <Key android:codes="110" android:keyLabel="n"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_n"
- />
- <Key android:codes="109" android:keyLabel="m"/>
- <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete"
- android:keyWidth="15%p" android:keyEdgeFlags="right"
- android:iconPreview="@drawable/sym_keyboard_feedback_delete"
- android:isRepeatable="true"/>
+ <Key
+ android:codes="-1"
+ android:keyIcon="@drawable/sym_bkeyboard_shift"
+ android:keyWidth="15%p"
+ android:isModifier="true"
+ android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+ android:isSticky="true"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_z" />
+ <Key
+ android:codes="120"
+ android:keyLabel="x" />
+ <Key
+ android:codes="99"
+ android:keyLabel="c"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_c" />
+ <Key
+ android:codes="118"
+ android:keyLabel="v" />
+ <Key
+ android:codes="98"
+ android:keyLabel="b" />
+ <Key
+ android:codes="110"
+ android:keyLabel="n"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_n" />
+ <Key
+ android:codes="109"
+ android:keyLabel="m" />
+ <Key
+ android:codes="-5"
+ android:keyIcon="@drawable/sym_bkeyboard_delete"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right"
+ android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+ android:isRepeatable="true" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_normal"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="/" android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_url"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="/"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="\@"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_email"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="\@" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:keyLabel=":-)" android:keyOutputText=":-) "
- android:popupKeyboard="@xml/popup_smileys"
- android:keyWidth="25%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_im"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="46"
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel=":-)"
+ android:keyOutputText=":-) "
+ android:popupKeyboard="@xml/popup_smileys"
+ android:keyWidth="25%p"
+ android:keyEdgeFlags="right" />
</Row>
-
- <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom">
- <Key android:codes="-2" android:keyLabel="@string/label_symbol_key"
- android:keyWidth="15%p" android:keyEdgeFlags="left"/>
- <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings"
- android:iconPreview="@drawable/sym_keyboard_feedback_settings"
- android:keyWidth="10%p"/>
- <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic"
- android:iconPreview="@drawable/sym_keyboard_feedback_mic"
- android:keyWidth="10%p"/>
- <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space"
- android:iconPreview="@drawable/sym_keyboard_feedback_space"
- android:keyWidth="30%p" android:isRepeatable="true"/>
- <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab"
- android:iconPreview="@drawable/sym_keyboard_feedback_tab"
- android:keyWidth="10%p"/>
- <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"
- android:keyWidth="10%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="15%p" android:keyEdgeFlags="right"/>
+ <Row
+ android:keyboardMode="@+id/mode_webentry"
+ android:rowEdgeFlags="bottom"
+ >
+ <Key
+ android:codes="-2"
+ android:keyLabel="@string/label_symbol_key"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="left" />
+ <Key
+ android:codes="@integer/key_settings"
+ android:keyIcon="@drawable/sym_bkeyboard_settings"
+ android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="@integer/key_f1"
+ android:keyIcon="@drawable/sym_bkeyboard_mic"
+ android:iconPreview="@drawable/sym_keyboard_feedback_mic"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="32"
+ android:keyIcon="@drawable/sym_bkeyboard_space"
+ android:iconPreview="@drawable/sym_keyboard_feedback_space"
+ android:keyWidth="30%p"
+ android:isRepeatable="true" />
+ <Key
+ android:codes="9"
+ android:keyIcon="@drawable/sym_bkeyboard_tab"
+ android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+ android:keyWidth="10%p" />
+ <Key
+ android:keyLabel="."
+ android:popupKeyboard="@xml/popup_punctuation"
+ android:keyWidth="10%p" />
+ <Key
+ android:codes="10"
+ android:keyIcon="@drawable/sym_bkeyboard_return"
+ android:iconPreview="@drawable/sym_keyboard_feedback_return"
+ android:keyWidth="15%p"
+ android:keyEdgeFlags="right" />
</Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file