Merge "Extract alternates_for_X from strings.xml into altchars.xml" into gingerbread
diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml
index 1f4c50f..04481e1 100644
--- a/java/res/xml-da/kbd_qwerty.xml
+++ b/java/res/xml-da/kbd_qwerty.xml
@@ -242,7 +242,8 @@
android:isModifier="true" />
<Key
android:keyLabel="/"
- android:keyWidth="10%p" />
+ android:keyWidth="10%p"
+ android:isModifier="true" />
<Key
android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
@@ -392,4 +393,4 @@
android:keyEdgeFlags="right"
android:isModifier="true" />
</Row>
-</Keyboard>
\ No newline at end of file
+</Keyboard>
diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml
index 52ac242..8829b53 100755
--- a/java/res/xml-de/kbd_qwerty.xml
+++ b/java/res/xml-de/kbd_qwerty.xml
@@ -18,173 +18,346 @@
*/
-->
-<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" />
+ <Key
+ android:codes="119"
+ android:keyLabel="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" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z" />
+ <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="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" />
+ <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: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="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_y" />
+ <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"
>
-
- <Row>
- <Key android:codes="113" android:keyLabel="q" 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="@string/alternates_for_e"
- />
- <Key android:codes="114" android:keyLabel="r"/>
- <Key android:codes="116" android:keyLabel="t"/>
- <Key android:codes="122" android:keyLabel="z" />
- <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="-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>
- <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"/>
- <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: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"
+ 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"
+ 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: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>
- <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="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_y"
- />
- <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
+ 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_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_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_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>
-
- <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>
diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml
index 5e7261a..ce53793 100755
--- a/java/res/xml-de/kbd_qwerty_black.xml
+++ b/java/res/xml-de/kbd_qwerty_black.xml
@@ -18,173 +18,314 @@
*/
-->
-<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" />
+ <Key
+ android:codes="119"
+ android:keyLabel="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" />
+ <Key
+ android:codes="116"
+ android:keyLabel="t" />
+ <Key
+ android:codes="122"
+ android:keyLabel="z" />
+ <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="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" />
+ <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: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="121"
+ android:keyLabel="y"
+ android:popupKeyboard="@xml/kbd_popup_template"
+ android:popupCharacters="@string/alternates_for_y" />
+ <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"
>
-
- <Row>
- <Key android:codes="113" android:keyLabel="q" 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="@string/alternates_for_e"
- />
- <Key android:codes="114" android:keyLabel="r"/>
- <Key android:codes="116" android:keyLabel="t"/>
- <Key android:codes="122" android:keyLabel="z" />
- <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="-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>
- <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"/>
- <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: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>
- <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="121" android:keyLabel="y"
- android:popupKeyboard="@xml/kbd_popup_template"
- android:popupCharacters="@string/alternates_for_y"
- />
- <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
+ 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_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_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_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>
-
- <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>
diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml
index f7e605c..e8d5348 100644
--- a/java/res/xml-fr/kbd_qwerty.xml
+++ b/java/res/xml-fr/kbd_qwerty.xml
@@ -211,7 +211,8 @@
android:isModifier="true" />
<Key
android:keyLabel="/"
- android:keyWidth="10%p" />
+ android:keyWidth="10%p"
+ android:isModifier="true" />
<Key
android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
@@ -361,4 +362,4 @@
android:keyEdgeFlags="right"
android:isModifier="true" />
</Row>
-</Keyboard>
\ No newline at end of file
+</Keyboard>
diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml
index 4287abb..20e5941 100755
--- a/java/res/xml-iw/kbd_qwerty.xml
+++ b/java/res/xml-iw/kbd_qwerty.xml
@@ -162,7 +162,8 @@
android:isModifier="true" />
<Key
android:keyLabel="/"
- android:keyWidth="10%p" />
+ android:keyWidth="10%p"
+ android:isModifier="true" />
<Key
android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
@@ -312,4 +313,4 @@
android:keyEdgeFlags="right"
android:isModifier="true" />
</Row>
-</Keyboard>
\ No newline at end of file
+</Keyboard>
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml
index 7f023ac..e4bcc14 100644
--- a/java/res/xml-nb/kbd_qwerty.xml
+++ b/java/res/xml-nb/kbd_qwerty.xml
@@ -240,7 +240,8 @@
android:isModifier="true" />
<Key
android:keyLabel="/"
- android:keyWidth="10%p" />
+ android:keyWidth="10%p"
+ android:isModifier="true" />
<Key
android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
@@ -390,4 +391,4 @@
android:keyEdgeFlags="right"
android:isModifier="true" />
</Row>
-</Keyboard>
\ No newline at end of file
+</Keyboard>
diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml
index 3414b6b..27a6157 100755
--- a/java/res/xml-ru/kbd_qwerty.xml
+++ b/java/res/xml-ru/kbd_qwerty.xml
@@ -184,7 +184,8 @@
android:isModifier="true" />
<Key
android:keyLabel="/"
- android:keyWidth="10%p" />
+ android:keyWidth="10%p"
+ android:isModifier="true" />
<Key
android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
@@ -334,4 +335,4 @@
android:keyEdgeFlags="right"
android:isModifier="true" />
</Row>
-</Keyboard>
\ No newline at end of file
+</Keyboard>
diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml
index e8d1214..412fb2e 100644
--- a/java/res/xml-sr/kbd_qwerty.xml
+++ b/java/res/xml-sr/kbd_qwerty.xml
@@ -175,7 +175,8 @@
android:isModifier="true" />
<Key
android:keyLabel="/"
- android:keyWidth="10%p" />
+ android:keyWidth="10%p"
+ android:isModifier="true" />
<Key
android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
@@ -325,4 +326,4 @@
android:keyEdgeFlags="right"
android:isModifier="true" />
</Row>
-</Keyboard>
\ No newline at end of file
+</Keyboard>
diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml
index e44c67e..34063f9 100644
--- a/java/res/xml-sv/kbd_qwerty.xml
+++ b/java/res/xml-sv/kbd_qwerty.xml
@@ -243,7 +243,8 @@
android:isModifier="true" />
<Key
android:keyLabel="/"
- android:keyWidth="10%p" />
+ android:keyWidth="10%p"
+ android:isModifier="true" />
<Key
android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
@@ -393,4 +394,4 @@
android:keyEdgeFlags="right"
android:isModifier="true" />
</Row>
-</Keyboard>
\ No newline at end of file
+</Keyboard>
diff --git a/java/res/xml/azerty.xml b/java/res/xml/azerty.xml
deleted file mode 100644
index 614aa49..0000000
--- a/java/res/xml/azerty.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<Keyboard xmlns: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"/>
- </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"/>
- </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: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:rowEdgeFlags="bottom">
- <Key android:codes="-3" android:keyIcon="@drawable/sym_keyboard_done"
- android:iconPreview="@drawable/sym_keyboard_feedback_done"
- android:keyWidth="20%p" android:keyEdgeFlags="left"/>
- <Key android:codes="-2" android:keyLabel="123" android:keyWidth="15%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"/>
- <Key android:codes="46,44" android:keyLabel=". ,"
- android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="15%p"/>
- <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return"
- android:iconPreview="@drawable/sym_keyboard_feedback_return"
- android:keyWidth="20%p" android:keyEdgeFlags="right"/>
- </Row>
-</Keyboard>
-
\ No newline at end of file
diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml
index c141f96..5580b2b 100755
--- a/java/res/xml/kbd_qwerty.xml
+++ b/java/res/xml/kbd_qwerty.xml
@@ -230,7 +230,8 @@
android:isModifier="true" />
<Key
android:keyLabel="/"
- android:keyWidth="10%p" />
+ android:keyWidth="10%p"
+ android:isModifier="true" />
<Key
android:codes="32"
android:keyIcon="@drawable/sym_keyboard_space"
@@ -380,4 +381,4 @@
android:keyEdgeFlags="right"
android:isModifier="true" />
</Row>
-</Keyboard>
\ No newline at end of file
+</Keyboard>