diff options
Diffstat (limited to 'java/res')
25 files changed, 3362 insertions, 478 deletions
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 971e22965..936609924 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -24,4 +24,12 @@ <string name="sentence_separators">.,!?)</string> <!-- Symbols that are suggested between words --> <string name="suggested_punctuations">!?,\u0022\u0027:()-/@_</string> + + <!-- Option values to show/hide the settings key in onscreen keyboard --> + <!-- Automatically decide to show or hide the settings key --> + <string name="settings_key_mode_auto" translatable="false">0</string> + <!-- Always show the settings key --> + <string name="settings_key_mode_always_show" translatable="false">1</string> + <!-- Always hide the settings key --> + <string name="settings_key_mode_always_hide" translatable="false">2</string> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index bf8e987c9..56dceef2d 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -91,6 +91,27 @@ <!-- Description for auto completion --> <string name="auto_complete_summary">Spacebar and punctuation automatically insert highlighted word</string> + <!-- Option to show/hide the settings key --> + <string name="prefs_settings_key">Show settings key</string> + <!-- Array of the settings key mode values --> + <string-array name="settings_key_modes_values" translatable="false"> + <item>@string/settings_key_mode_auto</item> + <item>@string/settings_key_mode_always_show</item> + <item>@string/settings_key_mode_always_hide</item> + </string-array> + <!-- Option to automatically decide to show/hide the settings key --> + <string name="settings_key_mode_auto_name">Automatic</string> + <!-- Option to always show the settings key --> + <string name="settings_key_mode_always_show_name">Always show</string> + <!-- Option to always hide the settings key --> + <string name="settings_key_mode_always_hide_name">Always hide</string> + <!-- Array of the settings key modes --> + <string-array name="settings_key_modes"> + <item>@string/settings_key_mode_auto_name</item> + <item>@string/settings_key_mode_always_show_name</item> + <item>@string/settings_key_mode_always_hide_name</item> + </string-array> + <!-- Option to enable bigram completion --> <string name="bigram_suggestion">Bigram Suggestions</string> <!-- Description for auto completion --> diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml index 1794d4c86..d9d6a15ac 100644 --- a/java/res/xml-da/kbd_qwerty.xml +++ b/java/res/xml-da/kbd_qwerty.xml @@ -165,6 +165,184 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -177,13 +355,11 @@ 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="@integer/key_space" @@ -195,7 +371,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -206,7 +381,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -219,11 +395,9 @@ 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="@integer/key_space" @@ -235,7 +409,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -246,7 +419,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -259,7 +433,6 @@ 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="\@" @@ -284,7 +457,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -297,13 +471,11 @@ 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="@integer/key_space" @@ -315,7 +487,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:keyLabel=":-)" @@ -326,7 +497,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -339,13 +511,11 @@ 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="@integer/key_space" @@ -358,12 +528,10 @@ android:codes="@integer/key_tab" 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="@integer/key_return" diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml index 96bbd8c4f..700d4e206 100644 --- a/java/res/xml-da/kbd_qwerty_black.xml +++ b/java/res/xml-da/kbd_qwerty_black.xml @@ -164,6 +164,158 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -174,13 +326,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -189,8 +339,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -199,7 +348,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -210,11 +360,9 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key - android:keyLabel="/" - android:keyWidth="10%p" /> + android:keyLabel="/" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -223,8 +371,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -233,7 +380,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -244,8 +392,7 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:keyLabel="\@" /> <Key @@ -265,7 +412,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -276,13 +424,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -291,8 +437,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " @@ -301,7 +446,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -312,13 +458,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -328,12 +472,10 @@ <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml index d5690577f..c8a2818aa 100644 --- a/java/res/xml-de/kbd_qwerty.xml +++ b/java/res/xml-de/kbd_qwerty.xml @@ -144,6 +144,184 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -156,13 +334,11 @@ 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="@integer/key_space" @@ -174,7 +350,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -185,7 +360,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -198,11 +374,9 @@ 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="@integer/key_space" @@ -214,7 +388,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -225,7 +398,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -238,7 +412,6 @@ 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="\@" @@ -263,7 +436,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -276,13 +450,11 @@ 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="@integer/key_space" @@ -294,7 +466,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:keyLabel=":-)" @@ -305,7 +476,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -318,13 +490,11 @@ 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="@integer/key_space" @@ -337,12 +507,10 @@ android:codes="@integer/key_tab" 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="@integer/key_return" diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml index 791aa0263..50e648907 100644 --- a/java/res/xml-de/kbd_qwerty_black.xml +++ b/java/res/xml-de/kbd_qwerty_black.xml @@ -143,6 +143,158 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -153,13 +305,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -168,8 +318,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -178,7 +327,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -189,11 +339,9 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key - android:keyLabel="/" - android:keyWidth="10%p" /> + android:keyLabel="/" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -202,8 +350,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -212,7 +359,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -223,8 +371,7 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:keyLabel="\@" /> <Key @@ -244,7 +391,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -255,13 +403,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -270,8 +416,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " @@ -280,7 +425,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -291,13 +437,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -307,12 +451,10 @@ <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml index 1eabd6759..5ec591030 100644 --- a/java/res/xml-fr/kbd_qwerty.xml +++ b/java/res/xml-fr/kbd_qwerty.xml @@ -145,6 +145,184 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -157,13 +335,11 @@ 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="@integer/key_space" @@ -175,7 +351,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -186,7 +361,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -199,11 +375,9 @@ 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="@integer/key_space" @@ -215,7 +389,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -226,7 +399,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -239,7 +413,6 @@ 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="\@" @@ -264,7 +437,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -277,13 +451,11 @@ 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="@integer/key_space" @@ -295,7 +467,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:keyLabel=":-)" @@ -306,7 +477,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -319,13 +491,11 @@ 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="@integer/key_space" @@ -338,12 +508,10 @@ android:codes="@integer/key_tab" 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="@integer/key_return" diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml index a4ed8ebc5..dc45c9eaf 100644 --- a/java/res/xml-fr/kbd_qwerty_black.xml +++ b/java/res/xml-fr/kbd_qwerty_black.xml @@ -144,6 +144,158 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -154,13 +306,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -169,8 +319,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -179,7 +328,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -190,11 +340,9 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key - android:keyLabel="/" - android:keyWidth="10%p" /> + android:keyLabel="/" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -203,8 +351,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -213,7 +360,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -224,8 +372,7 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:keyLabel="\@" /> <Key @@ -245,7 +392,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -256,13 +404,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -271,8 +417,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " @@ -281,7 +426,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -292,13 +438,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -308,12 +452,10 @@ <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml index 21a222258..714c4f55c 100644 --- a/java/res/xml-iw/kbd_qwerty.xml +++ b/java/res/xml-iw/kbd_qwerty.xml @@ -103,6 +103,184 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -115,13 +293,11 @@ 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="@integer/key_space" @@ -133,7 +309,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -144,7 +319,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -157,11 +333,9 @@ 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="@integer/key_space" @@ -173,7 +347,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -184,20 +357,20 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:keyLabel="\@" @@ -222,7 +395,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -235,13 +409,11 @@ 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="@integer/key_space" @@ -253,7 +425,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:keyLabel=":-)" @@ -264,7 +435,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -277,13 +449,11 @@ 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="@integer/key_space" @@ -296,12 +466,10 @@ android:codes="@integer/key_tab" 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="@integer/key_return" diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml index 36cb8aa44..eb65fbedd 100644 --- a/java/res/xml-iw/kbd_qwerty_black.xml +++ b/java/res/xml-iw/kbd_qwerty_black.xml @@ -102,6 +102,158 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -112,13 +264,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -127,8 +277,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -137,7 +286,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -148,11 +298,9 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key - android:keyLabel="/" - android:keyWidth="10%p" /> + android:keyLabel="/" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -161,8 +309,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -171,7 +318,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -182,8 +330,7 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:keyLabel="\@" /> <Key @@ -203,7 +350,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -214,13 +362,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -229,8 +375,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " @@ -239,7 +384,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -250,13 +396,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -266,12 +410,10 @@ <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml index da430b8b3..8bff10457 100644 --- a/java/res/xml-nb/kbd_qwerty.xml +++ b/java/res/xml-nb/kbd_qwerty.xml @@ -165,6 +165,184 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -177,13 +355,11 @@ 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="@integer/key_space" @@ -195,7 +371,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -206,7 +381,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -219,11 +395,9 @@ 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="@integer/key_space" @@ -235,7 +409,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -246,7 +419,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -259,7 +433,6 @@ 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="\@" @@ -284,7 +457,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -297,13 +471,11 @@ 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="@integer/key_space" @@ -315,7 +487,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:keyLabel=":-)" @@ -326,7 +497,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -339,13 +511,11 @@ 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="@integer/key_space" @@ -358,12 +528,10 @@ android:codes="@integer/key_tab" 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="@integer/key_return" diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml index 990d7af38..bad8d0dc4 100644 --- a/java/res/xml-nb/kbd_qwerty_black.xml +++ b/java/res/xml-nb/kbd_qwerty_black.xml @@ -164,6 +164,158 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -174,13 +326,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -189,8 +339,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -199,7 +348,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -210,11 +360,9 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key - android:keyLabel="/" - android:keyWidth="10%p" /> + android:keyLabel="/" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -223,8 +371,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -233,7 +380,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -244,8 +392,7 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:keyLabel="\@" /> <Key @@ -265,7 +412,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -276,13 +424,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -291,8 +437,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " @@ -301,7 +446,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -312,13 +458,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -328,12 +472,10 @@ <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml index b86a3d68b..129e68e9b 100644 --- a/java/res/xml-ru/kbd_qwerty.xml +++ b/java/res/xml-ru/kbd_qwerty.xml @@ -143,6 +143,184 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -155,13 +333,11 @@ 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="@integer/key_space" @@ -173,7 +349,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -184,7 +359,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -197,11 +373,9 @@ 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="@integer/key_space" @@ -213,7 +387,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -224,7 +397,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -237,7 +411,6 @@ 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="\@" @@ -262,7 +435,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -275,13 +449,11 @@ 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="@integer/key_space" @@ -293,7 +465,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:keyLabel=":-)" @@ -304,7 +475,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -317,13 +489,11 @@ 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="@integer/key_space" @@ -336,12 +506,10 @@ android:codes="@integer/key_tab" 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="@integer/key_return" diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml index 711d0bed1..02894ede4 100644 --- a/java/res/xml-ru/kbd_qwerty_black.xml +++ b/java/res/xml-ru/kbd_qwerty_black.xml @@ -142,6 +142,158 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -152,13 +304,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -167,8 +317,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -177,7 +326,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -188,11 +338,9 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key - android:keyLabel="/" - android:keyWidth="10%p" /> + android:keyLabel="/" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -201,8 +349,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -211,7 +358,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -222,8 +370,7 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:keyLabel="\@" /> <Key @@ -243,7 +390,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -254,13 +402,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -269,8 +415,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " @@ -279,7 +424,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -290,13 +436,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -306,12 +450,10 @@ <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml index 7e24e0790..5fb1ed35d 100644 --- a/java/res/xml-sr/kbd_qwerty.xml +++ b/java/res/xml-sr/kbd_qwerty.xml @@ -136,6 +136,184 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -148,13 +326,11 @@ 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="@integer/key_space" @@ -166,7 +342,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -177,7 +352,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -190,11 +366,9 @@ 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="@integer/key_space" @@ -206,7 +380,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -217,7 +390,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -230,7 +404,6 @@ 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="\@" @@ -255,26 +428,25 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" 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="@integer/key_space" @@ -286,7 +458,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:keyLabel=":-)" @@ -297,7 +468,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -310,13 +482,11 @@ 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="@integer/key_space" @@ -329,12 +499,10 @@ android:codes="@integer/key_tab" 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="@integer/key_return" diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml index a376e5fd5..73fc0d79b 100644 --- a/java/res/xml-sr/kbd_qwerty_black.xml +++ b/java/res/xml-sr/kbd_qwerty_black.xml @@ -135,6 +135,158 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -145,13 +297,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -160,8 +310,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -170,7 +319,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -181,11 +331,9 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key - android:keyLabel="/" - android:keyWidth="10%p" /> + android:keyLabel="/" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -194,8 +342,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -204,7 +351,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -215,8 +363,7 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:keyLabel="\@" /> <Key @@ -236,7 +383,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -247,13 +395,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -262,8 +408,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " @@ -272,7 +417,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -283,13 +429,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -299,12 +443,10 @@ <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml index efca9c0f7..ba51904e5 100644 --- a/java/res/xml-sv/kbd_qwerty.xml +++ b/java/res/xml-sv/kbd_qwerty.xml @@ -166,6 +166,184 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -178,13 +356,11 @@ 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="@integer/key_space" @@ -196,7 +372,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -207,7 +382,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -220,11 +396,9 @@ 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="@integer/key_space" @@ -236,7 +410,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -247,7 +420,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -260,7 +434,6 @@ 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="\@" @@ -285,7 +458,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -298,13 +472,11 @@ 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="@integer/key_space" @@ -316,7 +488,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:keyLabel=":-)" @@ -327,7 +498,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -340,13 +512,11 @@ 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="@integer/key_space" @@ -359,12 +529,10 @@ android:codes="@integer/key_tab" 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="@integer/key_return" diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml index f1f3653ea..68de10ddc 100644 --- a/java/res/xml-sv/kbd_qwerty_black.xml +++ b/java/res/xml-sv/kbd_qwerty_black.xml @@ -166,6 +166,158 @@ </Row> <Row android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -176,13 +328,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -191,8 +341,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -201,7 +350,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -212,11 +362,9 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key - android:keyLabel="/" - android:keyWidth="10%p" /> + android:keyLabel="/" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -225,8 +373,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -235,7 +382,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -246,8 +394,7 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:keyLabel="\@" /> <Key @@ -267,7 +414,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -278,13 +426,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -293,8 +439,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " @@ -303,7 +448,8 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" android:rowEdgeFlags="bottom" > <Key @@ -314,13 +460,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -330,12 +474,10 @@ <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml index 44562875a..311d43ab7 100644 --- a/java/res/xml/kbd_qwerty.xml +++ b/java/res/xml/kbd_qwerty.xml @@ -149,6 +149,178 @@ <Key android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" android:isModifier="true" android:keyEdgeFlags="left" /> @@ -156,13 +328,11 @@ 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="@integer/key_space" @@ -174,7 +344,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -185,7 +354,7 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" android:rowEdgeFlags="bottom" > <Key @@ -198,11 +367,9 @@ 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="@integer/key_space" @@ -214,7 +381,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:codes="@integer/key_return" @@ -225,7 +391,7 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" android:rowEdgeFlags="bottom" > <Key @@ -238,7 +404,6 @@ 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="\@" @@ -263,7 +428,7 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" android:rowEdgeFlags="bottom" > <Key @@ -276,13 +441,11 @@ 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="@integer/key_space" @@ -294,7 +457,6 @@ <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true" /> <Key android:keyLabel=":-)" @@ -305,7 +467,7 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" android:rowEdgeFlags="bottom" > <Key @@ -318,13 +480,11 @@ 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="@integer/key_space" @@ -337,12 +497,10 @@ android:codes="@integer/key_tab" 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="@integer/key_return" diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml index d40203d9d..ea506b660 100644 --- a/java/res/xml/kbd_qwerty_black.xml +++ b/java/res/xml/kbd_qwerty_black.xml @@ -148,18 +148,162 @@ <Key android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isRepeatable="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isRepeatable="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + 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" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -168,8 +312,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -178,7 +321,7 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_url" + android:keyboardMode="@+id/mode_url_with_settings_key" android:rowEdgeFlags="bottom" > <Key @@ -189,11 +332,9 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key - android:keyLabel="/" - android:keyWidth="10%p" /> + android:keyLabel="/" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -202,8 +343,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" @@ -212,7 +352,7 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_email" + android:keyboardMode="@+id/mode_email_with_settings_key" android:rowEdgeFlags="bottom" > <Key @@ -223,8 +363,7 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:keyLabel="\@" /> <Key @@ -244,7 +383,7 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_im" + android:keyboardMode="@+id/mode_im_with_settings_key" android:rowEdgeFlags="bottom" > <Key @@ -255,13 +394,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -270,8 +407,7 @@ android:isRepeatable="true" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:keyLabel=":-)" android:keyOutputText=":-) " @@ -280,7 +416,7 @@ android:keyEdgeFlags="right" /> </Row> <Row - android:keyboardMode="@+id/mode_webentry" + android:keyboardMode="@+id/mode_webentry_with_settings_key" android:rowEdgeFlags="bottom" > <Key @@ -291,13 +427,11 @@ <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> <Key android:codes="@integer/key_space" android:keyIcon="@drawable/sym_bkeyboard_space" @@ -307,12 +441,10 @@ <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" /> + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> <Key android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" /> + android:popupKeyboard="@xml/popup_punctuation" /> <Key android:codes="@integer/key_return" android:keyIcon="@drawable/sym_bkeyboard_return" diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml index fad3ebc10..fbdead6c3 100644 --- a/java/res/xml/kbd_symbols.xml +++ b/java/res/xml/kbd_symbols.xml @@ -121,20 +121,40 @@ android:isRepeatable="true" android:isModifier="true"/> </Row> - <Row android:rowEdgeFlags="bottom"> + <Row + android:keyboardMode="@+id/mode_symbols" + android:rowEdgeFlags="bottom" + > + <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" + android:keyWidth="20%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:isModifier="true"/> + <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" + android:keyWidth="40%p" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:isRepeatable="true" android:isModifier="true"/> + <Key android:codes="46" android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> + <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="20%p" android:keyEdgeFlags="right" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:isModifier="true"/> + </Row> + + <Row + android:keyboardMode="@+id/mode_symbols_with_settings_key" + android:rowEdgeFlags="bottom" + > <Key android:codes="-2" android:keyLabel="@string/label_alpha_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:keyWidth="10%p" android:isModifier="true"/> + android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:keyWidth="30%p" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> + android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:isModifier="true"/> diff --git a/java/res/xml/kbd_symbols_black.xml b/java/res/xml/kbd_symbols_black.xml index 7eae55481..3bf1397ae 100644 --- a/java/res/xml/kbd_symbols_black.xml +++ b/java/res/xml/kbd_symbols_black.xml @@ -121,22 +121,39 @@ android:isRepeatable="true"/> </Row> - <Row android:rowEdgeFlags="bottom"> + <Row + android:keyboardMode="@+id/mode_symbols" + android:rowEdgeFlags="bottom" + > + <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" + android:keyWidth="20%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_f1"/> + <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" + android:keyWidth="40%p" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:isRepeatable="true"/> + <Key android:codes="46" android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation"/> + <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="20%p" android:keyEdgeFlags="right" + android:iconPreview="@drawable/sym_keyboard_feedback_return"/> + </Row> + + <Row + android:keyboardMode="@+id/mode_symbols_with_settings_key" + android:rowEdgeFlags="bottom" + > <Key android:codes="-2" android:keyLabel="@string/label_alpha_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:keyWidth="10%p"/> + android:iconPreview="@drawable/sym_keyboard_feedback_settings"/> + <Key android:codes="@integer/key_f1"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:keyWidth="30%p" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - /> + android:iconPreview="@drawable/sym_keyboard_feedback_return"/> </Row> </Keyboard> diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml index b0693917e..b72ea50e5 100644 --- a/java/res/xml/kbd_symbols_shift.xml +++ b/java/res/xml/kbd_symbols_shift.xml @@ -88,18 +88,39 @@ android:isRepeatable="true" android:isModifier="true"/> </Row> - <Row android:rowEdgeFlags="bottom"> + <Row + android:keyboardMode="@+id/mode_symbols" + android:rowEdgeFlags="bottom" + > + <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="20%p" + android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:keyLabel="„" android:isModifier="true"/> + <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" + android:keyWidth="40%p" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:isRepeatable="true" android:isModifier="true"/> + <Key android:keyLabel="…" android:isModifier="true"/> + <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" + android:keyWidth="20%p" android:keyEdgeFlags="right" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:isModifier="true"/> + </Row> + + <Row + android:keyboardMode="@+id/mode_symbols_with_settings_key" + android:rowEdgeFlags="bottom" + > <Key android:codes="-2" android:keyLabel="@string/label_alpha_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"/> + android:isModifier="true"/> + <Key android:keyLabel="„" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:keyWidth="30%p" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="…" android:keyWidth="10%p" android:isModifier="true"/> + <Key android:keyLabel="…" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_return" diff --git a/java/res/xml/kbd_symbols_shift_black.xml b/java/res/xml/kbd_symbols_shift_black.xml index 250e0854c..b52c9d176 100644 --- a/java/res/xml/kbd_symbols_shift_black.xml +++ b/java/res/xml/kbd_symbols_shift_black.xml @@ -88,21 +88,39 @@ android:isRepeatable="true"/> </Row> - <Row android:rowEdgeFlags="bottom"> + <Row + android:keyboardMode="@+id/mode_symbols" + android:rowEdgeFlags="bottom" + > + <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="20%p" + android:keyEdgeFlags="left"/> + <Key android:keyLabel="„" /> + <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" + android:keyWidth="40%p" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:isRepeatable="true"/> + <Key android:keyLabel="…" /> + <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" + android:keyWidth="20%p" android:keyEdgeFlags="right" + android:iconPreview="@drawable/sym_keyboard_feedback_return" /> + </Row> + + <Row + android:keyboardMode="@+id/mode_symbols_with_settings_key" + android:rowEdgeFlags="bottom" + > <Key android:codes="-2" android:keyLabel="@string/label_alpha_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" /> + android:iconPreview="@drawable/sym_keyboard_feedback_settings"/> + <Key android:keyLabel="„" /> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:keyWidth="30%p" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:isRepeatable="true"/> - <Key android:keyLabel="…" android:keyWidth="10%p" /> + <Key android:keyLabel="…" /> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - /> + android:iconPreview="@drawable/sym_keyboard_feedback_return" /> </Row> </Keyboard> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 762ada00c..2e6dffaf4 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -60,6 +60,15 @@ /> <ListPreference + android:key="settings_key" + android:title="@string/prefs_settings_key" + android:persistent="true" + android:entryValues="@array/settings_key_modes_values" + android:entries="@array/settings_key_modes" + android:defaultValue="@string/settings_key_mode_auto" + /> + + <ListPreference android:key="voice_mode" android:title="@string/voice_input" android:persistent="true" |