diff options
Diffstat (limited to 'java/res/xml-nb')
-rw-r--r-- | java/res/xml-nb/kbd_qwerty.xml | 84 | ||||
-rw-r--r-- | java/res/xml-nb/kbd_qwerty_black.xml | 24 |
2 files changed, 64 insertions, 44 deletions
diff --git a/java/res/xml-nb/kbd_qwerty.xml b/java/res/xml-nb/kbd_qwerty.xml index 548ba2d8e..da430b8b3 100644 --- a/java/res/xml-nb/kbd_qwerty.xml +++ b/java/res/xml-nb/kbd_qwerty.xml @@ -34,10 +34,14 @@ <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyWidth="8.75%p" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" @@ -67,7 +71,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_o" /> <Key - android:keyLabel="p" /> + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> <Key android:keyLabel="å" android:keyWidth="8.75%p" @@ -91,7 +97,9 @@ <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -108,6 +116,8 @@ android:popupCharacters="@string/alternates_for_oe" /> <Key android:keyLabel="æ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_ae" android:keyWidth="8.75%p" android:keyEdgeFlags="right" /> </Row> @@ -117,9 +127,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -147,11 +157,11 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" android:isRepeatable="true" - android:isModifier="true" /> + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" @@ -161,8 +171,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -180,8 +190,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -192,8 +202,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_url" @@ -203,8 +213,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -220,8 +230,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -232,8 +242,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_email" @@ -243,8 +253,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -259,8 +269,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -270,8 +280,8 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_im" @@ -281,8 +291,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -300,8 +310,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" @@ -312,8 +322,8 @@ android:keyOutputText=":-) " android:popupKeyboard="@xml/popup_smileys" android:keyWidth="25%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_webentry" @@ -323,8 +333,8 @@ android:codes="@integer/key_symbol" android:keyLabel="@string/label_symbol_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="left" /> <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" @@ -342,8 +352,8 @@ android:keyIcon="@drawable/sym_keyboard_space" android:iconPreview="@drawable/sym_keyboard_feedback_space" android:keyWidth="30%p" - android:isRepeatable="true" - android:isModifier="true" /> + android:isModifier="true" + android:isRepeatable="true" /> <Key android:codes="@integer/key_tab" android:keyIcon="@drawable/sym_keyboard_tab" @@ -360,7 +370,7 @@ android:keyIcon="@drawable/sym_keyboard_return" android:iconPreview="@drawable/sym_keyboard_feedback_return" android:keyWidth="15%p" - android:keyEdgeFlags="right" - android:isModifier="true" /> + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-nb/kbd_qwerty_black.xml b/java/res/xml-nb/kbd_qwerty_black.xml index ffc94dcd8..990d7af38 100644 --- a/java/res/xml-nb/kbd_qwerty_black.xml +++ b/java/res/xml-nb/kbd_qwerty_black.xml @@ -34,10 +34,14 @@ <Row> <Key android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" android:keyWidth="8.75%p" android:keyEdgeFlags="left" /> <Key - android:keyLabel="w" /> + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> <Key android:keyLabel="e" android:popupKeyboard="@xml/kbd_popup_template" @@ -67,7 +71,9 @@ android:popupKeyboard="@xml/kbd_popup_template" android:popupCharacters="@string/alternates_for_o" /> <Key - android:keyLabel="p" /> + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> <Key android:keyLabel="å" android:keyWidth="8.75%p" @@ -91,7 +97,9 @@ <Key android:keyLabel="f" /> <Key - android:keyLabel="g" /> + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> <Key android:keyLabel="h" /> <Key @@ -108,6 +116,8 @@ android:popupCharacters="@string/alternates_for_oe" /> <Key android:keyLabel="æ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_ae" android:keyWidth="8.75%p" android:keyEdgeFlags="right" /> </Row> @@ -117,9 +127,9 @@ <Key android:codes="@integer/key_shift" android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" android:isSticky="true" android:keyEdgeFlags="left" /> <Key @@ -147,10 +157,10 @@ <Key android:codes="@integer/key_delete" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" - android:keyEdgeFlags="right" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" /> + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> <Row android:keyboardMode="@+id/mode_normal" |