diff options
Diffstat (limited to 'java')
46 files changed, 781 insertions, 596 deletions
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png Binary files differindex 48ebb6183..045e1bba7 100755..100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png Binary files differindex 38b8b48aa..14424b4c2 100755..100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png Binary files differindex 147c1b22e..f30ad1e7b 100755..100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png Binary files differindex f8affea64..3622e6203 100755..100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png Binary files differindex 75962e9b0..2733f9af7 100755..100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png Binary files differindex b7dccfe3c..a351be7a2 100755..100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png Binary files differindex 9ccad8020..e9e889c29 100755..100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png Binary files differindex ce58880db..959c6d14a 100755..100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png Binary files differindex fe6c517f9..1e6688c91 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png Binary files differindex d09bd3db3..597eb15b2 100755..100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png Binary files differindex 1dd1d0f20..92b478854 100755..100644 --- a/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png +++ b/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png Binary files differindex 2cb619e06..cfeeefb22 100755..100644 --- a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png +++ b/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png Binary files differindex 8cc85b7f5..7ca3e6131 100755..100644 --- a/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png +++ b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_globe.png b/java/res/drawable-hdpi/sym_bkeyboard_globe.png Binary files differdeleted file mode 100644 index f5dbe0cd1..000000000 --- a/java/res/drawable-hdpi/sym_bkeyboard_globe.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png Binary files differindex c7638bff1..889477cfb 100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png Binary files differindex 7acb07c86..b0f6d7feb 100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png diff --git a/java/res/drawable-hdpi/sym_keyboard_globe.png b/java/res/drawable-hdpi/sym_keyboard_globe.png Binary files differdeleted file mode 100644 index fa747642d..000000000 --- a/java/res/drawable-hdpi/sym_keyboard_globe.png +++ /dev/null diff --git a/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png Binary files differindex 65ccfda87..dcc4bd59b 100644 --- a/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png +++ b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png diff --git a/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png Binary files differindex 0d01bc224..ecf61a98e 100644 --- a/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png +++ b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png diff --git a/java/res/drawable-hdpi/sym_keyboard_settings.png b/java/res/drawable-hdpi/sym_keyboard_settings.png Binary files differindex f3bcdbcac..d57f7a43a 100644..100755 --- a/java/res/drawable-hdpi/sym_keyboard_settings.png +++ b/java/res/drawable-hdpi/sym_keyboard_settings.png diff --git a/java/res/drawable-mdpi/sym_bkeyboard_globe.png b/java/res/drawable-mdpi/sym_bkeyboard_globe.png Binary files differdeleted file mode 100644 index c6595cf62..000000000 --- a/java/res/drawable-mdpi/sym_bkeyboard_globe.png +++ /dev/null diff --git a/java/res/drawable-mdpi/sym_keyboard_globe.png b/java/res/drawable-mdpi/sym_keyboard_globe.png Binary files differdeleted file mode 100644 index f30c1b640..000000000 --- a/java/res/drawable-mdpi/sym_keyboard_globe.png +++ /dev/null diff --git a/java/res/drawable/btn_keyboard_key_gingerbread.xml b/java/res/drawable/btn_keyboard_key_gingerbread.xml index 24a547974..4a113a8a1 100644 --- a/java/res/drawable/btn_keyboard_key_gingerbread.xml +++ b/java/res/drawable/btn_keyboard_key_gingerbread.xml @@ -16,10 +16,16 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Functional keys. --> + + <item android:state_single="true" android:state_pressed="true" + android:drawable="@drawable/btn_keyboard_key_dark_pressed" /> + <item android:state_single="true" + android:drawable="@drawable/btn_keyboard_key_dark_normal" /> + <!-- Toggle keys. Use checkable/checked state. --> - <item android:state_checkable="true" android:state_checked="true" - android:state_pressed="true" + <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true" android:drawable="@drawable/btn_keyboard_key_dark_pressed_on" /> <item android:state_checkable="true" android:state_pressed="true" android:drawable="@drawable/btn_keyboard_key_dark_pressed_off" /> diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml index 0457395cd..fb8d062ee 100644 --- a/java/res/xml-da/kbd_qwerty.xml +++ b/java/res/xml-da/kbd_qwerty.xml @@ -112,92 +112,99 @@ <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:isRepeatable="true" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + 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="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> + android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="20%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> + android:keyWidth="15%p" android:isModifier="true"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> - </Keyboard> diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml index 575f0fa49..b9d1d1796 100644 --- a/java/res/xml-da/kbd_qwerty_black.xml +++ b/java/res/xml-da/kbd_qwerty_black.xml @@ -114,77 +114,83 @@ android:iconPreview="@drawable/sym_keyboard_feedback_delete" android:isRepeatable="true"/> </Row> - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="10%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> @@ -193,11 +199,11 @@ android:keyWidth="20%p" android:isRepeatable="true"/> <Key android:codes="9" 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"/> + android:keyWidth="15%p"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right"/> </Row> - </Keyboard> diff --git a/java/res/xml-de/kbd_qwerty.xml b/java/res/xml-de/kbd_qwerty.xml index 827ad62c7..763627a34 100755 --- a/java/res/xml-de/kbd_qwerty.xml +++ b/java/res/xml-de/kbd_qwerty.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> @@ -49,9 +49,9 @@ /> <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/> </Row> - + <Row> - <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p" + <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_a" android:keyEdgeFlags="left"/> @@ -67,7 +67,7 @@ <Key android:codes="107" android:keyLabel="k"/> <Key android:codes="108" android:keyLabel="l" android:keyEdgeFlags="right"/> </Row> - + <Row> <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" android:keyWidth="15%p" android:isModifier="true" @@ -90,90 +90,101 @@ /> <Key android:codes="109" android:keyLabel="m"/> <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" + android:keyWidth="15%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:isRepeatable="true" android:isModifier="true"/> </Row> - + <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" - android:keyWidth="10%p"/> + <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> + <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + 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="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> + <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> + android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="20%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> + android:keyWidth="15%p" android:isModifier="true"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> </Keyboard> diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml index 18fdc7d01..b0b6c238f 100755 --- a/java/res/xml-de/kbd_qwerty_black.xml +++ b/java/res/xml-de/kbd_qwerty_black.xml @@ -97,83 +97,94 @@ <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="10%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="20%p" android:isRepeatable="true"/> <Key android:codes="9" 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"/> + android:keyWidth="15%p"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right"/> </Row> </Keyboard> diff --git a/java/res/xml-fr/kbd_qwerty.xml b/java/res/xml-fr/kbd_qwerty.xml index 7df32d914..0f08c26c2 100644 --- a/java/res/xml-fr/kbd_qwerty.xml +++ b/java/res/xml-fr/kbd_qwerty.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> @@ -26,7 +26,7 @@ > <Row> - <Key android:codes="97" android:keyLabel="a" + <Key android:codes="97" android:keyLabel="a" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_a" android:keyEdgeFlags="left"/> @@ -55,7 +55,7 @@ /> <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/> </Row> - + <Row> <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/> <Key android:codes="115" android:keyLabel="s" @@ -73,7 +73,7 @@ </Row> <Row> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" + <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" android:keyWidth="15%p" android:isModifier="true" android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left"/> @@ -91,93 +91,102 @@ /> <!--Key android:codes="233,224,232,234" android:keyLabel="é"/--> <Key android:keyLabel="\'"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" + <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" + android:keyWidth="15%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:isRepeatable="true" android:isModifier="true"/> </Row> - + <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> + <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + 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="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> + <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> + android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="20%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> + android:keyWidth="15%p" android:isModifier="true"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> - </Keyboard> - diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml index 78b1da986..6d3aeb829 100644 --- a/java/res/xml-fr/kbd_qwerty_black.xml +++ b/java/res/xml-fr/kbd_qwerty_black.xml @@ -99,84 +99,94 @@ <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="10%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="20%p" android:isRepeatable="true"/> <Key android:codes="9" 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"/> + android:keyWidth="15%p"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right"/> </Row> - </Keyboard> diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml index 0ce5d367f..208ba92b4 100755 --- a/java/res/xml-iw/kbd_qwerty.xml +++ b/java/res/xml-iw/kbd_qwerty.xml @@ -41,7 +41,7 @@ android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="13.75%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:isRepeatable="true" android:isModifier="true"/> </Row> <Row> @@ -71,84 +71,95 @@ <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:keyLabel="\@" android:keyWidth="10%p"/> + 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="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> + android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="20%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> + android:keyWidth="15%p" android:isModifier="true"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> </Keyboard> diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml index 2bf0c2a0c..981ad37c3 100755 --- a/java/res/xml-iw/kbd_qwerty_black.xml +++ b/java/res/xml-iw/kbd_qwerty_black.xml @@ -71,84 +71,95 @@ <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:keyLabel="\@" android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:keyLabel="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="10%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="20%p" android:isRepeatable="true"/> <Key android:codes="9" 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"/> + android:keyWidth="15%p"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right"/> </Row> </Keyboard> diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml index a9e6adc9e..d033bb02c 100644 --- a/java/res/xml-nb/kbd_qwerty.xml +++ b/java/res/xml-nb/kbd_qwerty.xml @@ -110,92 +110,99 @@ <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:isRepeatable="true" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + 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="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> + android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="20%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> + android:keyWidth="15%p" android:isModifier="true"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> - </Keyboard> diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml index 8d23cc196..14456e6b6 100644 --- a/java/res/xml-nb/kbd_qwerty_black.xml +++ b/java/res/xml-nb/kbd_qwerty_black.xml @@ -115,74 +115,81 @@ <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="10%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> @@ -191,11 +198,11 @@ android:keyWidth="20%p" android:isRepeatable="true"/> <Key android:codes="9" 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"/> + android:keyWidth="15%p"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right"/> </Row> - </Keyboard> diff --git a/java/res/xml-ru/kbd_qwerty.xml b/java/res/xml-ru/kbd_qwerty.xml index 0c49f3781..e512c0b84 100755 --- a/java/res/xml-ru/kbd_qwerty.xml +++ b/java/res/xml-ru/kbd_qwerty.xml @@ -78,89 +78,100 @@ <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="11.75%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:isRepeatable="true" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:keyLabel="\@" android:keyWidth="10%p"/> + 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="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> + android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="20%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> + android:keyWidth="15%p" android:isModifier="true"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> </Keyboard> diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml index a9c88b7d2..00c399273 100755 --- a/java/res/xml-ru/kbd_qwerty_black.xml +++ b/java/res/xml-ru/kbd_qwerty_black.xml @@ -83,83 +83,94 @@ <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:keyLabel="\@" android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:keyLabel="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="10%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="20%p" android:isRepeatable="true"/> <Key android:codes="9" 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"/> + android:keyWidth="15%p"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right"/> </Row> </Keyboard> diff --git a/java/res/xml-sr/kbd_qwerty.xml b/java/res/xml-sr/kbd_qwerty.xml index 117db4c54..cab846004 100644 --- a/java/res/xml-sr/kbd_qwerty.xml +++ b/java/res/xml-sr/kbd_qwerty.xml @@ -74,88 +74,99 @@ <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="11.75%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:isRepeatable="true" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> - <Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:keyLabel="\@" android:keyWidth="10%p"/> + 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="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> - <Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_globe" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> + android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="20%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> + android:keyWidth="15%p" android:isModifier="true"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> </Keyboard> diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml index 91b118f27..00a289449 100644 --- a/java/res/xml-sr/kbd_qwerty_black.xml +++ b/java/res/xml-sr/kbd_qwerty_black.xml @@ -79,83 +79,94 @@ <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> - <Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:keyLabel="\@" android:keyWidth="10%p"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:keyLabel="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> - <Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_globe" + android:keyWidth="10%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> + <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="20%p" android:isRepeatable="true"/> <Key android:codes="9" 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"/> + android:keyWidth="15%p"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right"/> </Row> </Keyboard> diff --git a/java/res/xml-sv/kbd_qwerty.xml b/java/res/xml-sv/kbd_qwerty.xml index 1ffa9dd1c..514a44154 100644 --- a/java/res/xml-sv/kbd_qwerty.xml +++ b/java/res/xml-sv/kbd_qwerty.xml @@ -119,87 +119,94 @@ <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + 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="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="10%p" android:keyEdgeFlags="left" android:isModifier="true"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> + android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="20%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> + android:keyWidth="15%p" android:isModifier="true"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> - </Keyboard> diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml index af8cda60e..4cc37cec8 100644 --- a/java/res/xml-sv/kbd_qwerty_black.xml +++ b/java/res/xml-sv/kbd_qwerty_black.xml @@ -119,74 +119,81 @@ <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:keyLabel="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> - <!--Key android:keyLabel="@string/popular_domain_0" - android:keyOutputText="@string/popular_domain_0" - android:popupKeyboard="@xml/popup_domains" - android:keyWidth="20%p"/--> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="40%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="10%p"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> + android:keyWidth="10%p" android:keyEdgeFlags="left"/> + <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:keyWidth="10%p"/> <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" android:iconPreview="@drawable/sym_keyboard_feedback_mic" android:keyWidth="10%p"/> @@ -195,11 +202,11 @@ android:keyWidth="20%p" android:isRepeatable="true"/> <Key android:codes="9" 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"/> + android:keyWidth="15%p"/> + <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p"/> <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right"/> </Row> - </Keyboard> diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml index 59c61e4c8..0a0691dd1 100755 --- a/java/res/xml/kbd_qwerty.xml +++ b/java/res/xml/kbd_qwerty.xml @@ -4,20 +4,23 @@ ** ** Copyright 2008, The Android Open Source Project ** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at ** -** http://www.apache.org/licenses/LICENSE-2.0 +** http://www.apache.org/licenses/LICENSE-2.0 ** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and ** limitations under the License. */ --> +<!-- TODO: Add settings key to other languages --> +<!-- TODO: Add modifier attr to functional keys in other languages --> + <Keyboard xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" @@ -56,9 +59,9 @@ /> <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/> </Row> - + <Row> - <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p" + <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p" android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_a" android:keyEdgeFlags="left"/> @@ -82,9 +85,9 @@ android:popupCharacters="@string/alternates_for_l" android:keyEdgeFlags="right"/> </Row> - + <Row> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" + <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" android:keyWidth="15%p" android:isModifier="true" android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left"/> @@ -106,99 +109,99 @@ <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:isRepeatable="true" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> + <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> + android: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:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> + <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> + android: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:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="/" android:keyWidth="10%p"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> + android: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:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel="\@"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> + android: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: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:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> + <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" + android:keyWidth="10%p" android:isModifier="true"/> <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="10%p" android:keyEdgeFlags="left"/> + android:keyWidth="10%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: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:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="20%p" android:isRepeatable="true"/> + android:keyWidth="20%p" android:isRepeatable="true" android:isModifier="true"/> <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="15%p"/> + android:keyWidth="15%p" android:isModifier="true"/> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right"/> + android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> </Row> </Keyboard> diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml index 076359c95..286547283 100755 --- a/java/res/xml/kbd_qwerty_black.xml +++ b/java/res/xml/kbd_qwerty_black.xml @@ -201,5 +201,4 @@ android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" android:keyEdgeFlags="right"/> </Row> - </Keyboard> diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml index 3f6b8ac85..fad3ebc10 100755 --- a/java/res/xml/kbd_symbols.xml +++ b/java/res/xml/kbd_symbols.xml @@ -118,25 +118,25 @@ /> <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:isRepeatable="true" android:isModifier="true"/> </Row> <Row android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> + 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"/> - <Key android:codes="@integer/key_f1" android:keyWidth="10%p"/> + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:codes="@integer/key_f1" android:keyWidth="10%p" 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:isRepeatable="true" android:isModifier="true"/> <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> + android:keyWidth="10%p" 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"/> </Row> </Keyboard> diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml index 0ec4c713c..b0693917e 100755 --- a/java/res/xml/kbd_symbols_shift.xml +++ b/java/res/xml/kbd_symbols_shift.xml @@ -85,24 +85,24 @@ /> <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:isRepeatable="true" android:isModifier="true"/> </Row> <Row android:rowEdgeFlags="bottom"> <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p" - android:keyEdgeFlags="left"/> + 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"/> - <Key android:keyLabel="„" android:keyWidth="10%p" /> + android:keyWidth="10%p" android:isModifier="true"/> + <Key android:keyLabel="„" android:keyWidth="10%p" android:isModifier="true"/> <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" android:keyWidth="30%p" android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:isRepeatable="true"/> - <Key android:keyLabel="…" android:keyWidth="10%p" /> + android:isRepeatable="true" android:isModifier="true"/> + <Key android:keyLabel="…" android:keyWidth="10%p" 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"/> </Row> </Keyboard> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index a3c956e71..b4d2d903d 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -61,14 +61,14 @@ android:defaultValue="@string/voice_mode_main" /> - <ListPreference + <!-- <ListPreference android:key="keyboard_layout" android:title="@string/keyboard_layout" android:persistent="true" android:entryValues="@array/keyboard_layout_modes_values" android:entries="@array/keyboard_layout_modes" android:defaultValue="4" - /> + />--> <PreferenceScreen android:title="@string/language_selection_title" diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java index 223198b0b..9c0a5a3aa 100644 --- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java +++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java @@ -45,7 +45,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha public static final int KEYBOARDMODE_WEB = R.id.mode_webentry; public static final String DEFAULT_LAYOUT_ID = "4"; - public static final String PREF_KEYBOARD_LAYOUT = "keyboard_layout"; + public static final String PREF_KEYBOARD_LAYOUT = "pref_keyboard_layout_20100902"; private static final int[] THEMES = new int [] { R.layout.input_basic, R.layout.input_basic_highcontrast, R.layout.input_stone_normal, R.layout.input_stone_bold, R.layout.input_gingerbread}; diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java index 15e22f318..33519e4be 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java @@ -628,9 +628,20 @@ public class LatinKeyboard extends Keyboard { } class LatinKey extends Keyboard.Key { - + + // functional normal state (with properties) + private final int[] KEY_STATE_FUNCTIONAL_NORMAL = { + android.R.attr.state_single + }; + + // functional pressed state (with properties) + private final int[] KEY_STATE_FUNCTIONAL_PRESSED = { + android.R.attr.state_single, + android.R.attr.state_pressed + }; + private boolean mShiftLockEnabled; - + public LatinKey(Resources res, Keyboard.Row parent, int x, int y, XmlResourceParser parser) { super(res, parent, x, y, parser); @@ -639,11 +650,17 @@ public class LatinKeyboard extends Keyboard { popupResId = 0; } } - - void enableShiftLock() { + + private void enableShiftLock() { mShiftLockEnabled = true; } + // sticky is used for shift key. If a key is not sticky and is modifier, + // the key will be treated as functional. + private boolean isFunctionalKey() { + return !sticky && modifier; + } + @Override public void onReleased(boolean inside) { if (!mShiftLockEnabled) { @@ -665,6 +682,18 @@ public class LatinKeyboard extends Keyboard { boolean isInsideSuper(int x, int y) { return super.isInside(x, y); } + + @Override + public int[] getCurrentDrawableState() { + if (isFunctionalKey()) { + if (pressed) { + return KEY_STATE_FUNCTIONAL_PRESSED; + } else { + return KEY_STATE_FUNCTIONAL_NORMAL; + } + } + return super.getCurrentDrawableState(); + } } /** |
