diff options
Diffstat (limited to 'java/res/xml-nb')
-rw-r--r-- | java/res/xml-nb/kbd_qwerty.xml | 73 | ||||
-rw-r--r-- | java/res/xml-nb/kbd_qwerty_black.xml | 57 |
2 files changed, 72 insertions, 58 deletions
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> |