diff options
Diffstat (limited to 'java/res')
211 files changed, 9825 insertions, 3774 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 045e1bba7..0c4820b34 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 14424b4c2..5a20da1db 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 f30ad1e7b..4ec703d6c 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 3622e6203..93322d2e2 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 2733f9af7..5a9c722ce 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 a351be7a2..99b6cb170 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 e9e889c29..7dc59bf82 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 66f83ebd3..e3a77d61b 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 1e6688c91..431c44967 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 46c40a4cb..c150341e3 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_dark_background.9.png b/java/res/drawable-hdpi/keyboard_dark_background.9.png Binary files differindex 2d5c02080..f315cbdd4 100644 --- a/java/res/drawable-hdpi/keyboard_dark_background.9.png +++ b/java/res/drawable-hdpi/keyboard_dark_background.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_0.9.png b/java/res/drawable-hdpi/keyboard_hint_0.9.png Binary files differnew file mode 100644 index 000000000..271264e92 --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_hint_0.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_1.9.png b/java/res/drawable-hdpi/keyboard_hint_1.9.png Binary files differnew file mode 100644 index 000000000..eaf374262 --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_hint_1.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_2.9.png b/java/res/drawable-hdpi/keyboard_hint_2.9.png Binary files differnew file mode 100644 index 000000000..8a1657117 --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_hint_2.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_3.9.png b/java/res/drawable-hdpi/keyboard_hint_3.9.png Binary files differnew file mode 100644 index 000000000..34b501109 --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_hint_3.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_4.9.png b/java/res/drawable-hdpi/keyboard_hint_4.9.png Binary files differnew file mode 100644 index 000000000..d4cc250dd --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_hint_4.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_5.9.png b/java/res/drawable-hdpi/keyboard_hint_5.9.png Binary files differnew file mode 100644 index 000000000..6a054b42f --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_hint_5.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_6.9.png b/java/res/drawable-hdpi/keyboard_hint_6.9.png Binary files differnew file mode 100644 index 000000000..66e91400a --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_hint_6.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_7.9.png b/java/res/drawable-hdpi/keyboard_hint_7.9.png Binary files differnew file mode 100644 index 000000000..5eae24f4f --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_hint_7.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_8.9.png b/java/res/drawable-hdpi/keyboard_hint_8.9.png Binary files differnew file mode 100644 index 000000000..ea7f512fd --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_hint_8.9.png diff --git a/java/res/drawable-hdpi/keyboard_hint_9.9.png b/java/res/drawable-hdpi/keyboard_hint_9.9.png Binary files differnew file mode 100644 index 000000000..0bf85de93 --- /dev/null +++ b/java/res/drawable-hdpi/keyboard_hint_9.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 dd0ce95c7..762a25704 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 e14f25c1a..141d2d6be 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_popup_panel_background.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png Binary files differindex f94bc38ed..d6b2c7936 100755..100644 --- a/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png +++ b/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png diff --git a/java/res/drawable-hdpi/sym_keyboard_delete.png b/java/res/drawable-hdpi/sym_keyboard_delete.png Binary files differindex 3c89e2820..459ebcff8 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_delete.png +++ b/java/res/drawable-hdpi/sym_keyboard_delete.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png Binary files differindex 28dca5a15..8322e8e1d 100755..100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png Binary files differindex b72ec7bc0..8a02be07e 100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png Binary files differindex 5f319f5c6..abf15f8f9 100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png Binary files differindex 26000da50..1fd822ea6 100644 --- a/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png +++ b/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png diff --git a/java/res/drawable-hdpi/sym_keyboard_shift.png b/java/res/drawable-hdpi/sym_keyboard_shift.png Binary files differindex f433dca74..bf217d147 100644 --- a/java/res/drawable-hdpi/sym_keyboard_shift.png +++ b/java/res/drawable-hdpi/sym_keyboard_shift.png diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png Binary files differindex 6cb5372bb..d11b39712 100644 --- a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png +++ b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png diff --git a/java/res/drawable-hdpi/working.png b/java/res/drawable-hdpi/working.png Binary files differindex 8b51ed116..5ea702307 100755 --- a/java/res/drawable-hdpi/working.png +++ b/java/res/drawable-hdpi/working.png diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png Binary files differdeleted file mode 100755 index 603bf0e15..000000000 --- a/java/res/drawable-land-hdpi/btn_keyboard_key_normal.9.png +++ /dev/null diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png Binary files differdeleted file mode 100755 index 6ddd516e7..000000000 --- a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off.9.png +++ /dev/null diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off_stone.9.png Binary files differdeleted file mode 100644 index 67a204f85..000000000 --- a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_off_stone.9.png +++ /dev/null diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png Binary files differdeleted file mode 100755 index 65fdeb353..000000000 --- a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on.9.png +++ /dev/null diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on_stone.9.png Binary files differdeleted file mode 100644 index 63cbe60a3..000000000 --- a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_on_stone.9.png +++ /dev/null diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_normal_stone.9.png Binary files differdeleted file mode 100644 index 0dd33b429..000000000 --- a/java/res/drawable-land-hdpi/btn_keyboard_key_normal_stone.9.png +++ /dev/null diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png Binary files differdeleted file mode 100755 index 7ec915fe8..000000000 --- a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed.9.png +++ /dev/null diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png Binary files differdeleted file mode 100755 index 439271723..000000000 --- a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_off.9.png +++ /dev/null diff --git a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png Binary files differdeleted file mode 100755 index c2cc32044..000000000 --- a/java/res/drawable-land-hdpi/btn_keyboard_key_pressed_on.9.png +++ /dev/null diff --git a/java/res/drawable-land-mdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_normal.9.png Binary files differdeleted file mode 100644 index ea2506c6d..000000000 --- a/java/res/drawable-land-mdpi/btn_keyboard_key_normal.9.png +++ /dev/null diff --git a/java/res/drawable-land-mdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_normal_off_stone.9.png Binary files differdeleted file mode 100644 index 67a204f85..000000000 --- a/java/res/drawable-land-mdpi/btn_keyboard_key_normal_off_stone.9.png +++ /dev/null diff --git a/java/res/drawable-land-mdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_normal_on_stone.9.png Binary files differdeleted file mode 100644 index 63cbe60a3..000000000 --- a/java/res/drawable-land-mdpi/btn_keyboard_key_normal_on_stone.9.png +++ /dev/null diff --git a/java/res/drawable-land-mdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_normal_stone.9.png Binary files differdeleted file mode 100644 index 0dd33b429..000000000 --- a/java/res/drawable-land-mdpi/btn_keyboard_key_normal_stone.9.png +++ /dev/null diff --git a/java/res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png Binary files differdeleted file mode 100755 index 6b5c718c7..000000000 --- a/java/res/drawable-land-mdpi/btn_keyboard_key_pressed.9.png +++ /dev/null diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png Binary files differindex 48ebb6183..53fe9c97d 100755..100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png Binary files differindex 38b8b48aa..649ef9773 100755..100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png Binary files differindex 147c1b22e..93f7d87c2 100755..100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png Binary files differindex f8affea64..8560b3ba7 100755..100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png Binary files differindex 75962e9b0..778abaf24 100755..100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png Binary files differindex b7dccfe3c..2a23945e5 100755..100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png Binary files differindex 9ccad8020..6af2d8d0c 100755..100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_light_normal.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png Binary files differindex ce58880db..02d0fcf93 100755..100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png Binary files differindex fe6c517f9..125ff1335 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png Binary files differindex d09bd3db3..fdaf69966 100755..100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed.9.png diff --git a/java/res/drawable-mdpi/cancel.png b/java/res/drawable-mdpi/cancel.png Binary files differindex 081532bec..713a37875 100644 --- a/java/res/drawable-mdpi/cancel.png +++ b/java/res/drawable-mdpi/cancel.png diff --git a/java/res/drawable-mdpi/dialog_bubble_step02.9.png b/java/res/drawable-mdpi/dialog_bubble_step02.9.png Binary files differindex d77f85fe2..d77f85fe2 100755..100644 --- a/java/res/drawable-mdpi/dialog_bubble_step02.9.png +++ b/java/res/drawable-mdpi/dialog_bubble_step02.9.png diff --git a/java/res/drawable-mdpi/dialog_bubble_step07.9.png b/java/res/drawable-mdpi/dialog_bubble_step07.9.png Binary files differindex 80f4a0eaa..80f4a0eaa 100755..100644 --- a/java/res/drawable-mdpi/dialog_bubble_step07.9.png +++ b/java/res/drawable-mdpi/dialog_bubble_step07.9.png diff --git a/java/res/drawable-mdpi/ic_subtype_keyboard.png b/java/res/drawable-mdpi/ic_subtype_keyboard.png Binary files differindex 0d7ebd4e5..0d7ebd4e5 100755..100644 --- a/java/res/drawable-mdpi/ic_subtype_keyboard.png +++ b/java/res/drawable-mdpi/ic_subtype_keyboard.png diff --git a/java/res/drawable-mdpi/keyboard_dark_background.9.png b/java/res/drawable-mdpi/keyboard_dark_background.9.png Binary files differindex 2d5c02080..a2136f7de 100755..100644 --- a/java/res/drawable-mdpi/keyboard_dark_background.9.png +++ b/java/res/drawable-mdpi/keyboard_dark_background.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_0.9.png b/java/res/drawable-mdpi/keyboard_hint_0.9.png Binary files differnew file mode 100644 index 000000000..271264e92 --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_hint_0.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_1.9.png b/java/res/drawable-mdpi/keyboard_hint_1.9.png Binary files differnew file mode 100644 index 000000000..eaf374262 --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_hint_1.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_2.9.png b/java/res/drawable-mdpi/keyboard_hint_2.9.png Binary files differnew file mode 100644 index 000000000..8a1657117 --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_hint_2.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_3.9.png b/java/res/drawable-mdpi/keyboard_hint_3.9.png Binary files differnew file mode 100644 index 000000000..34b501109 --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_hint_3.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_4.9.png b/java/res/drawable-mdpi/keyboard_hint_4.9.png Binary files differnew file mode 100644 index 000000000..d4cc250dd --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_hint_4.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_5.9.png b/java/res/drawable-mdpi/keyboard_hint_5.9.png Binary files differnew file mode 100644 index 000000000..6a054b42f --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_hint_5.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_6.9.png b/java/res/drawable-mdpi/keyboard_hint_6.9.png Binary files differnew file mode 100644 index 000000000..66e91400a --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_hint_6.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_7.9.png b/java/res/drawable-mdpi/keyboard_hint_7.9.png Binary files differnew file mode 100644 index 000000000..5eae24f4f --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_hint_7.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_8.9.png b/java/res/drawable-mdpi/keyboard_hint_8.9.png Binary files differnew file mode 100644 index 000000000..ea7f512fd --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_hint_8.9.png diff --git a/java/res/drawable-mdpi/keyboard_hint_9.9.png b/java/res/drawable-mdpi/keyboard_hint_9.9.png Binary files differnew file mode 100644 index 000000000..0bf85de93 --- /dev/null +++ b/java/res/drawable-mdpi/keyboard_hint_9.9.png diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background.9.png Binary files differindex 2a80f096d..a84c19c39 100644 --- a/java/res/drawable-mdpi/keyboard_key_feedback_background.9.png +++ b/java/res/drawable-mdpi/keyboard_key_feedback_background.9.png diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png Binary files differindex 29aa285bd..82513aadd 100755..100644 --- a/java/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png +++ b/java/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background.9.png Binary files differindex 36d75df6f..0d9ab97f0 100644 --- a/java/res/drawable-mdpi/keyboard_popup_panel_background.9.png +++ b/java/res/drawable-mdpi/keyboard_popup_panel_background.9.png diff --git a/java/res/drawable-mdpi/keyboard_suggest_strip.9.png b/java/res/drawable-mdpi/keyboard_suggest_strip.9.png Binary files differindex 71bf5e8f4..fa6c0feff 100644 --- a/java/res/drawable-mdpi/keyboard_suggest_strip.9.png +++ b/java/res/drawable-mdpi/keyboard_suggest_strip.9.png diff --git a/java/res/drawable-mdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-mdpi/keyboard_suggest_strip_divider.png Binary files differindex c9413d7c1..363936362 100644 --- a/java/res/drawable-mdpi/keyboard_suggest_strip_divider.png +++ b/java/res/drawable-mdpi/keyboard_suggest_strip_divider.png diff --git a/java/res/drawable-mdpi/mic_slash.png b/java/res/drawable-mdpi/mic_slash.png Binary files differindex 0b0fb5803..d04b56344 100644 --- a/java/res/drawable-mdpi/mic_slash.png +++ b/java/res/drawable-mdpi/mic_slash.png diff --git a/java/res/drawable-mdpi/ok_cancel.png b/java/res/drawable-mdpi/ok_cancel.png Binary files differindex 0601d3231..20d10f986 100644 --- a/java/res/drawable-mdpi/ok_cancel.png +++ b/java/res/drawable-mdpi/ok_cancel.png diff --git a/java/res/drawable-mdpi/speak_now_level0.png b/java/res/drawable-mdpi/speak_now_level0.png Binary files differindex abc845466..5bd13603e 100644 --- a/java/res/drawable-mdpi/speak_now_level0.png +++ b/java/res/drawable-mdpi/speak_now_level0.png diff --git a/java/res/drawable-mdpi/speak_now_level1.png b/java/res/drawable-mdpi/speak_now_level1.png Binary files differindex 67cb235bf..ccb76b879 100644 --- a/java/res/drawable-mdpi/speak_now_level1.png +++ b/java/res/drawable-mdpi/speak_now_level1.png diff --git a/java/res/drawable-mdpi/speak_now_level2.png b/java/res/drawable-mdpi/speak_now_level2.png Binary files differindex 1e07f26c6..715f90081 100644 --- a/java/res/drawable-mdpi/speak_now_level2.png +++ b/java/res/drawable-mdpi/speak_now_level2.png diff --git a/java/res/drawable-mdpi/speak_now_level3.png b/java/res/drawable-mdpi/speak_now_level3.png Binary files differindex 31991daee..725248a25 100644 --- a/java/res/drawable-mdpi/speak_now_level3.png +++ b/java/res/drawable-mdpi/speak_now_level3.png diff --git a/java/res/drawable-mdpi/speak_now_level4.png b/java/res/drawable-mdpi/speak_now_level4.png Binary files differindex 7363ca892..ff6c50b40 100644 --- a/java/res/drawable-mdpi/speak_now_level4.png +++ b/java/res/drawable-mdpi/speak_now_level4.png diff --git a/java/res/drawable-mdpi/speak_now_level5.png b/java/res/drawable-mdpi/speak_now_level5.png Binary files differindex 9034908f4..a5d6b89d6 100644 --- a/java/res/drawable-mdpi/speak_now_level5.png +++ b/java/res/drawable-mdpi/speak_now_level5.png diff --git a/java/res/drawable-mdpi/speak_now_level6.png b/java/res/drawable-mdpi/speak_now_level6.png Binary files differindex 3eaa9bdad..dcdb48d08 100644 --- a/java/res/drawable-mdpi/speak_now_level6.png +++ b/java/res/drawable-mdpi/speak_now_level6.png diff --git a/java/res/drawable-mdpi/sym_keyboard_delete.png b/java/res/drawable-mdpi/sym_keyboard_delete.png Binary files differindex 43a033ead..1b0f3f836 100644 --- a/java/res/drawable-mdpi/sym_keyboard_delete.png +++ b/java/res/drawable-mdpi/sym_keyboard_delete.png diff --git a/java/res/drawable-mdpi/sym_keyboard_done.png b/java/res/drawable-mdpi/sym_keyboard_done.png Binary files differindex c0d6d1394..c0d6d1394 100755..100644 --- a/java/res/drawable-mdpi/sym_keyboard_done.png +++ b/java/res/drawable-mdpi/sym_keyboard_done.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png b/java/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png Binary files differindex bc11cf31a..c556c35cb 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-mdpi/sym_keyboard_feedback_delete.png Binary files differindex 1edb10b4e..a79f15852 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_delete.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_delete.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_done.png b/java/res/drawable-mdpi/sym_keyboard_feedback_done.png Binary files differindex 0d7ebd4e5..0d7ebd4e5 100755..100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_done.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_done.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png b/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png Binary files differindex e3f80fada..eecb02694 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png b/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png Binary files differindex 3cb0d9913..7e10ae3af 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-mdpi/sym_keyboard_feedback_mic.png Binary files differindex 247d5b3a9..3ed0782d3 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_mic.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_mic.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_numalt.png b/java/res/drawable-mdpi/sym_keyboard_feedback_numalt.png Binary files differindex aac737615..bc8f1cfc3 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_numalt.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_numalt.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_return.png b/java/res/drawable-mdpi/sym_keyboard_feedback_return.png Binary files differindex 03d9c9b2d..dd99ff381 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_return.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_return.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_search.png b/java/res/drawable-mdpi/sym_keyboard_feedback_search.png Binary files differindex f4af341eb..6b8e01d90 100755..100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_search.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_search.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-mdpi/sym_keyboard_feedback_settings.png Binary files differindex 08ba18f28..03bad1843 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_settings.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_settings.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-mdpi/sym_keyboard_feedback_shift.png Binary files differindex 97f4661f8..d56357559 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_shift.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_shift.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png Binary files differindex 7194b30b0..494524a66 100755..100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_space.png b/java/res/drawable-mdpi/sym_keyboard_feedback_space.png Binary files differindex 739db6879..36eb60c13 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_space.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_space.png diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png Binary files differindex 593fa6703..a10dc8fa2 100644 --- a/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png +++ b/java/res/drawable-mdpi/sym_keyboard_feedback_tab.png diff --git a/java/res/drawable-mdpi/sym_keyboard_language_arrows_left.png b/java/res/drawable-mdpi/sym_keyboard_language_arrows_left.png Binary files differindex 91eda5f2d..7067a8bf5 100644 --- a/java/res/drawable-mdpi/sym_keyboard_language_arrows_left.png +++ b/java/res/drawable-mdpi/sym_keyboard_language_arrows_left.png diff --git a/java/res/drawable-mdpi/sym_keyboard_language_arrows_right.png b/java/res/drawable-mdpi/sym_keyboard_language_arrows_right.png Binary files differindex 62a5beba4..f7a133d9e 100644 --- a/java/res/drawable-mdpi/sym_keyboard_language_arrows_right.png +++ b/java/res/drawable-mdpi/sym_keyboard_language_arrows_right.png diff --git a/java/res/drawable-mdpi/sym_keyboard_mic.png b/java/res/drawable-mdpi/sym_keyboard_mic.png Binary files differindex a75809549..e926b3fa6 100644 --- a/java/res/drawable-mdpi/sym_keyboard_mic.png +++ b/java/res/drawable-mdpi/sym_keyboard_mic.png diff --git a/java/res/drawable-mdpi/sym_keyboard_return.png b/java/res/drawable-mdpi/sym_keyboard_return.png Binary files differindex 17f257439..0c10f004a 100644 --- a/java/res/drawable-mdpi/sym_keyboard_return.png +++ b/java/res/drawable-mdpi/sym_keyboard_return.png diff --git a/java/res/drawable-mdpi/sym_keyboard_search.png b/java/res/drawable-mdpi/sym_keyboard_search.png Binary files differindex 127755d6b..614f85f5e 100755..100644 --- a/java/res/drawable-mdpi/sym_keyboard_search.png +++ b/java/res/drawable-mdpi/sym_keyboard_search.png diff --git a/java/res/drawable-mdpi/sym_keyboard_settings.png b/java/res/drawable-mdpi/sym_keyboard_settings.png Binary files differindex f3bcdbcac..ad7618fa0 100644 --- a/java/res/drawable-mdpi/sym_keyboard_settings.png +++ b/java/res/drawable-mdpi/sym_keyboard_settings.png diff --git a/java/res/drawable-mdpi/sym_keyboard_shift.png b/java/res/drawable-mdpi/sym_keyboard_shift.png Binary files differindex 0566e5a88..5109b0471 100644 --- a/java/res/drawable-mdpi/sym_keyboard_shift.png +++ b/java/res/drawable-mdpi/sym_keyboard_shift.png diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_lock.png b/java/res/drawable-mdpi/sym_keyboard_shift_lock.png Binary files differnew file mode 100644 index 000000000..244179c2d --- /dev/null +++ b/java/res/drawable-mdpi/sym_keyboard_shift_lock.png diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_locked.png b/java/res/drawable-mdpi/sym_keyboard_shift_locked.png Binary files differindex ccaf05d3b..244179c2d 100755..100644 --- a/java/res/drawable-mdpi/sym_keyboard_shift_locked.png +++ b/java/res/drawable-mdpi/sym_keyboard_shift_locked.png diff --git a/java/res/drawable-mdpi/sym_keyboard_space.png b/java/res/drawable-mdpi/sym_keyboard_space.png Binary files differindex 4e6273b89..cbe4a88d6 100644 --- a/java/res/drawable-mdpi/sym_keyboard_space.png +++ b/java/res/drawable-mdpi/sym_keyboard_space.png diff --git a/java/res/drawable-mdpi/sym_keyboard_space_led.9.png b/java/res/drawable-mdpi/sym_keyboard_space_led.9.png Binary files differindex 71da57319..1c1ca2cc7 100644 --- a/java/res/drawable-mdpi/sym_keyboard_space_led.9.png +++ b/java/res/drawable-mdpi/sym_keyboard_space_led.9.png diff --git a/java/res/drawable-mdpi/sym_keyboard_tab.png b/java/res/drawable-mdpi/sym_keyboard_tab.png Binary files differindex cd9daff08..eddb9a592 100644 --- a/java/res/drawable-mdpi/sym_keyboard_tab.png +++ b/java/res/drawable-mdpi/sym_keyboard_tab.png diff --git a/java/res/drawable-mdpi/voice_ime_background.9.png b/java/res/drawable-mdpi/voice_ime_background.9.png Binary files differindex 67802492a..9b15bc25f 100644 --- a/java/res/drawable-mdpi/voice_ime_background.9.png +++ b/java/res/drawable-mdpi/voice_ime_background.9.png diff --git a/java/res/drawable-mdpi/working.png b/java/res/drawable-mdpi/working.png Binary files differindex 6246a6d1c..4a930c52d 100644 --- a/java/res/drawable-mdpi/working.png +++ b/java/res/drawable-mdpi/working.png diff --git a/java/res/drawable/btn_keyboard_key_gingerbread_popup.xml b/java/res/drawable/btn_keyboard_key_gingerbread_popup.xml new file mode 100644 index 000000000..9b6d23beb --- /dev/null +++ b/java/res/drawable/btn_keyboard_key_gingerbread_popup.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_pressed="true" + android:drawable="@drawable/btn_keyboard_key_light_popup_selected" /> + <item android:drawable="@drawable/btn_keyboard_key_light_popup_normal" /> +</selector> diff --git a/java/res/layout/candidate_preview.xml b/java/res/layout/candidate_preview.xml index fe2002d46..fe2002d46 100755..100644 --- a/java/res/layout/candidate_preview.xml +++ b/java/res/layout/candidate_preview.xml diff --git a/java/res/layout/candidates.xml b/java/res/layout/candidates.xml index 478e20ba1..b89d44290 100755..100644 --- a/java/res/layout/candidates.xml +++ b/java/res/layout/candidates.xml @@ -31,6 +31,8 @@ android:layout_width="wrap_content" android:layout_height="@dimen/candidate_strip_height" android:layout_weight="1" + android:fadingEdge="horizontal" + android:fadingEdgeLength="@dimen/candidate_strip_fading_edge_length" /> </LinearLayout> diff --git a/java/res/layout/input_basic.xml b/java/res/layout/input_basic.xml index 168eba691..168eba691 100755..100644 --- a/java/res/layout/input_basic.xml +++ b/java/res/layout/input_basic.xml diff --git a/java/res/layout/input_basic_highcontrast.xml b/java/res/layout/input_basic_highcontrast.xml index 19ff1db11..19ff1db11 100755..100644 --- a/java/res/layout/input_basic_highcontrast.xml +++ b/java/res/layout/input_basic_highcontrast.xml diff --git a/java/res/layout/input_gingerbread.xml b/java/res/layout/input_gingerbread.xml index 8f59cae21..8f59cae21 100755..100644 --- a/java/res/layout/input_gingerbread.xml +++ b/java/res/layout/input_gingerbread.xml diff --git a/java/res/layout/input_stone_bold.xml b/java/res/layout/input_stone_bold.xml index e3588bb22..e3588bb22 100755..100644 --- a/java/res/layout/input_stone_bold.xml +++ b/java/res/layout/input_stone_bold.xml diff --git a/java/res/layout/input_stone_normal.xml b/java/res/layout/input_stone_normal.xml index fd7bf85fc..fd7bf85fc 100755..100644 --- a/java/res/layout/input_stone_normal.xml +++ b/java/res/layout/input_stone_normal.xml diff --git a/java/res/layout/input_stone_popup.xml b/java/res/layout/input_stone_popup.xml index f159625f7..f159625f7 100755..100644 --- a/java/res/layout/input_stone_popup.xml +++ b/java/res/layout/input_stone_popup.xml diff --git a/java/res/layout/input_trans.xml b/java/res/layout/input_trans.xml index 4c0979c04..4c0979c04 100755..100644 --- a/java/res/layout/input_trans.xml +++ b/java/res/layout/input_trans.xml diff --git a/java/res/layout/keyboard_key_preview.xml b/java/res/layout/key_preview.xml index de03506ad..de03506ad 100644 --- a/java/res/layout/keyboard_key_preview.xml +++ b/java/res/layout/key_preview.xml diff --git a/java/res/layout/input_gingerbread_popup.xml b/java/res/layout/keyboard_popup.xml index 0cc953edf..9a52e2cbd 100755..100644 --- a/java/res/layout/input_gingerbread_popup.xml +++ b/java/res/layout/keyboard_popup.xml @@ -17,7 +17,6 @@ ** limitations under the License. */ --> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" @@ -33,7 +32,8 @@ android:layout_height="wrap_content" android:background="@drawable/keyboard_dark_background" - latin:keyBackground="@drawable/btn_keyboard_key_gingerbread" - latin:popupLayout="@layout/input_gingerbread_popup" - /> + latin:keyBackground="@drawable/btn_keyboard_key_gingerbread_popup" + latin:keyHysteresisDistance="0dip" + latin:verticalCorrection="-20dip" + /> </LinearLayout> diff --git a/java/res/layout/keyboard_popup_keyboard.xml b/java/res/layout/keyboard_popup_keyboard.xml deleted file mode 100644 index 6d3985065..000000000 --- a/java/res/layout/keyboard_popup_keyboard.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:background="@drawable/keyboard_popup_panel_background" - > - <com.android.inputmethod.latin.LatinKeyboardBaseView - xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" - android:id="@+id/LatinKeyboardBaseView" - android:layout_alignParentBottom="true" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@android:color/transparent" - - latin:keyBackground="@drawable/btn_keyboard_key_gingerbread" - latin:keyPreviewLayout="@layout/keyboard_key_preview" - latin:popupLayout="@layout/keyboard_popup_keyboard" - /> -</LinearLayout> diff --git a/java/res/values-cs/donottranslate-altchars.xml b/java/res/values-cs/donottranslate-altchars.xml new file mode 100644 index 000000000..d91a0e449 --- /dev/null +++ b/java/res/values-cs/donottranslate-altchars.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">áàâãäåæ</string> + <string name="alternates_for_e">3éěèêë</string> + <string name="alternates_for_i">íìîï8</string> + <string name="alternates_for_o">óòôõöœø9</string> + <string name="alternates_for_u">ůúùûü7</string> + <string name="alternates_for_s">š§ß</string> + <string name="alternates_for_n">ňñ</string> + <string name="alternates_for_c">čç</string> + <string name="alternates_for_y">ýÿ6</string> + <string name="alternates_for_d">ď</string> + <string name="alternates_for_r">ř4</string> + <string name="alternates_for_t">ť5</string> + <string name="alternates_for_z">ž</string> +</resources> diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index e0fbc9b92..32a593947 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Pokročilé"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Uloženo"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"áàâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"éěèêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"íìîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"óòôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ůúùûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"š§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ňñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"čç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Podržením klávesy zobrazíte diakritiku (á, ž apod.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Stisknutím klávesy Zpět ↶ můžete klávesnici kdykoli zavřít."</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Přístup k číslům a symbolům"</string> diff --git a/java/res/values-da/donottranslate-altchars.xml b/java/res/values-da/donottranslate-altchars.xml new file mode 100644 index 000000000..b1cc8b627 --- /dev/null +++ b/java/res/values-da/donottranslate-altchars.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">áàâąã</string> + <string name="alternates_for_e">3éèêëę€</string> + <string name="alternates_for_i">íìîï8</string> + <string name="alternates_for_o">óòôõ9</string> + <string name="alternates_for_u">úùûū7</string> + <string name="alternates_for_s">śšşß</string> + <string name="alternates_for_n">ńñň</string> + <string name="alternates_for_c">çćč</string> + <string name="alternates_for_y">ýÿü6</string> + <string name="alternates_for_d">ðď</string> + <string name="alternates_for_r">ř4</string> + <string name="alternates_for_t">ťþ5</string> + <string name="alternates_for_z">źžż</string> + <string name="alternates_for_l">ł</string> + <string name="alternates_for_v">w</string> + <string name="alternates_for_ae">ä</string> + <string name="alternates_for_oe">öœ</string> +</resources> diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index 0b0aff254..ed832b5ec 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Avanceret"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Gemt"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Hold en tast nede for at se accenter (ø, ö osv.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Tryk på knappen Tilbage ↶ for når som helst at lukke for tastaturet"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Få adgang til tal og symboler"</string> diff --git a/java/res/values-de/donottranslate-altchars.xml b/java/res/values-de/donottranslate-altchars.xml new file mode 100644 index 000000000..df27bce28 --- /dev/null +++ b/java/res/values-de/donottranslate-altchars.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">ä</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">ö9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_z">6</string> +</resources> diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index b0ae766f1..58b741ad7 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Erweitert"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: gespeichert"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"ä"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"ö"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Zur Anzeige von Umlauten (ä, ö usw.) Taste gedrückt halten"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Zum Schließen der Tastatur ↶ drücken"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Auf Zahlen und Symbole zugreifen"</string> diff --git a/java/res/values-en/donottranslate.xml b/java/res/values-el/donottranslate-altchars.xml index f5692735a..d3beafade 100644 --- a/java/res/values-en/donottranslate.xml +++ b/java/res/values-el/donottranslate-altchars.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2008, The Android Open Source Project +** Copyright 2010, 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. @@ -18,14 +18,13 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Accented forms of "e" --> - <string name="alternates_for_e">èéêë3</string> - <!-- Accented forms of "i" --> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> <string name="alternates_for_i">ìíîï8</string> - <!-- Accented forms of "o" --> <string name="alternates_for_o">òóôõöœø9</string> - <!-- Accented forms of "u" --> <string name="alternates_for_u">ùúûü7</string> - <!-- Accented forms of "y" --> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index 09a98f413..687679c2e 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Σύνθετη"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Αποθηκεύτηκε"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Κρατήστε πατημένο ένα πλήκτρο για να δείτε τους τονισμένους χαρακτήρες (ø, ö, κ.τ.λ.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Πατήστε το πλήκτρο Πίσω ↶ για να κλείσετε το πληκτρολόγιο ανά πάσα στιγμή"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Πρόσβαση σε αριθμούς και σύμβολα"</string> diff --git a/java/res/values-pl/donottranslate.xml b/java/res/values-en/donottranslate-altchars.xml index 196e73c1d..083befa19 100644 --- a/java/res/values-pl/donottranslate.xml +++ b/java/res/values-en/donottranslate-altchars.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2009, The Android Open Source Project +** Copyright 2010, 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. @@ -18,8 +18,10 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Accented characters related to "z" --> - <string name="alternates_for_z">źż</string> - <!-- Accented characters related to "l" --> - <string name="alternates_for_l">ł</string> + <string name="alternates_for_a">àáâãäåāæ</string> + <string name="alternates_for_e">3èéêëē</string> + <string name="alternates_for_i">ìíîïī8</string> + <string name="alternates_for_o">òóôõöōœø9</string> + <string name="alternates_for_u">ùúûüū7</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-es-rUS/donottranslate-altchars.xml b/java/res/values-es-rUS/donottranslate-altchars.xml new file mode 100644 index 000000000..d3beafade --- /dev/null +++ b/java/res/values-es-rUS/donottranslate-altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> +</resources> diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index effd5b9c2..360b713bd 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Avanzado"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Mantén una tecla presionada para ver los acentos (ø, ö, etc.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Pulsa la tecla hacia atrás ↶ para cerrar el teclado en cualquier momento"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Acceder a números y símbolos"</string> diff --git a/java/res/values-cs/donottranslate.xml b/java/res/values-es/donottranslate-altchars.xml index 9c2a476a6..721062d2d 100644 --- a/java/res/values-cs/donottranslate.xml +++ b/java/res/values-es/donottranslate-altchars.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2009, The Android Open Source Project +** Copyright 2010, 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. @@ -18,12 +18,13 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Accented characters related to "d" --> - <string name="alternates_for_d">ď</string> - <!-- Accented characters related to "r" --> - <string name="alternates_for_r">ř</string> - <!-- Accented characters related to "t" --> - <string name="alternates_for_t">ť</string> - <!-- Accented characters related to "z" --> - <string name="alternates_for_z">ž</string> + <string name="alternates_for_a">á</string> + <string name="alternates_for_e">3é</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">ó9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> </resources> diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml index bc98bce92..c1af352ba 100644 --- a/java/res/values-es/strings.xml +++ b/java/res/values-es/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Avanzado"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"á"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"é"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"ó"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Mantén pulsada una tecla para ver los caracteres acentuados (ø, ö, etc.)."</string> <string name="tip_dismiss" msgid="7585579046862204381">"Pulsa la tecla \"Atrás\" ↶ para cerrar el teclado en cualquier momento."</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Acceso a números y símbolos"</string> diff --git a/java/res/values-fr/donottranslate-altchars.xml b/java/res/values-fr/donottranslate-altchars.xml new file mode 100644 index 000000000..874d89dab --- /dev/null +++ b/java/res/values-fr/donottranslate-altchars.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">1àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> + <string name="alternates_for_q"></string> + <string name="alternates_for_w"></string> + <string name="alternates_for_z">2</string> +</resources> diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index a9f03e56e..86014b3d4 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Avancé"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : enregistré"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Maintenir une touche enfoncée pour afficher les accents (à, é, etc.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Appuyez sur la touche Retour ↶ pour fermer le clavier à tout moment."</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Accéder aux chiffres et symboles"</string> diff --git a/java/res/values-it/donottranslate-altchars.xml b/java/res/values-it/donottranslate-altchars.xml new file mode 100644 index 000000000..23960171b --- /dev/null +++ b/java/res/values-it/donottranslate-altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àá</string> + <string name="alternates_for_e">3èé</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òó9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> +</resources> diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index 2063488be..995fc2946 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Avanzate"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : parola salvata"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àá"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èé"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òó"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Tieni premuto un tasto per vedere le lettere con segni diacritici (ø, ö etc.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Premi il tasto Indietro ↶ per chiudere la tastiera"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Accedi a numeri e simboli"</string> diff --git a/java/res/values-ja/donottranslate-altchars.xml b/java/res/values-ja/donottranslate-altchars.xml new file mode 100644 index 000000000..d3beafade --- /dev/null +++ b/java/res/values-ja/donottranslate-altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> +</resources> diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index e7d3bda7a..26c2cd414 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"高度"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>:保存しました"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"キー長押しでアクセント文字を表示（ø、öなど）"</string> <string name="tip_dismiss" msgid="7585579046862204381">"戻るキーでキーボードを閉じます"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"数字と記号"</string> diff --git a/java/res/values-ko/donottranslate-altchars.xml b/java/res/values-ko/donottranslate-altchars.xml new file mode 100644 index 000000000..d3beafade --- /dev/null +++ b/java/res/values-ko/donottranslate-altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> +</resources> diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index cf8d285e3..0fb53cb1c 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"고급"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: 저장됨"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"키를 길게 누르면 악센트(ø, ö 등)가 표시됩니다."</string> <string name="tip_dismiss" msgid="7585579046862204381">"키보드를 닫으려면 언제든지 뒤로 키(↶)를 누르세요."</string> <string name="tip_access_symbols" msgid="6344098517525531652">"숫자 및 기호 사용"</string> diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index 43951552e..ac0e030d4 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -21,5 +21,9 @@ <resources> <dimen name="key_height">47dip</dimen> <dimen name="candidate_strip_height">38dip</dimen> + <dimen name="candidate_strip_fading_edge_length">63dip</dimen> <dimen name="spacebar_vertical_correction">2dip</dimen> -</resources>
\ No newline at end of file + <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> + <!-- key_height * 1.7 --> + <dimen name="mini_keyboard_slide_allowance">79.9dip</dimen> +</resources> diff --git a/java/res/values-nb/donottranslate-altchars.xml b/java/res/values-nb/donottranslate-altchars.xml new file mode 100644 index 000000000..6257dfc31 --- /dev/null +++ b/java/res/values-nb/donottranslate-altchars.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">äáàâąã</string> + <string name="alternates_for_e">3éèêëę€</string> + <string name="alternates_for_i">íìîï8</string> + <string name="alternates_for_o">öóòôõ9</string> + <string name="alternates_for_u">üúùûū7</string> + <string name="alternates_for_s">śšşß</string> + <string name="alternates_for_n">ńñň</string> + <string name="alternates_for_c">çćč</string> + <string name="alternates_for_y">ýÿ6</string> + <string name="alternates_for_d">ðď</string> + <string name="alternates_for_r">ř4</string> + <string name="alternates_for_t">ťþ5</string> + <string name="alternates_for_z">źžż</string> + <string name="alternates_for_l">ł</string> + <string name="alternates_for_v">w</string> + <string name="alternates_for_oe">œ</string> +</resources> diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index 7d49c669c..df614adac 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Avansert"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: Lagret"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"åæáàâãä"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"éèêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"íìîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"ôóòöõœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"üùúû"</string> - <string name="alternates_for_s" msgid="348762530927662188">"ߧ"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Hold en tast nede for å se aksenterte tegn (ø, ö, osv.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Trykk tilbakeknappen, ↶, for å lukke tastaturet"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Få tilgang til tall og symboler"</string> diff --git a/java/res/values-nl/donottranslate-altchars.xml b/java/res/values-nl/donottranslate-altchars.xml new file mode 100644 index 000000000..d3beafade --- /dev/null +++ b/java/res/values-nl/donottranslate-altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> +</resources> diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index d1cfd53ab..3f663e85e 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Geavanceerd"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: opgeslagen"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Houd een toets ingedrukt om diakritische tekens weer te geven (ø, ö, enzovoort)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Druk op elk gewenst moment op de toets Terug ↶ om het toetsenbord te sluiten"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Toegang tot cijfers en symbolen"</string> diff --git a/java/res/values-pl/donottranslate-altchars.xml b/java/res/values-pl/donottranslate-altchars.xml new file mode 100644 index 000000000..da6b5fd5c --- /dev/null +++ b/java/res/values-pl/donottranslate-altchars.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">ą</string> + <string name="alternates_for_e">ę3</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">ó9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">ś</string> + <string name="alternates_for_n">ń</string> + <string name="alternates_for_c">ć</string> + <string name="alternates_for_y">ýÿ6</string> + <string name="alternates_for_z">źż</string> + <string name="alternates_for_l">ł</string> +</resources> diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index cfdfcc69d..b770cc697 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Zaawansowany"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Zapisano"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"ą"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"ę"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"ó"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"ś"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ń"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ć"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Przytrzymaj klawisz, aby wyświetlić znaki akcentowane (ą, ó itp.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Naciśnij klawisz cofania ↶, aby zamknąć klawiaturę w dowolnym momencie"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Przejdź do cyfr i symboli"</string> diff --git a/java/res/values-pt-rPT/donottranslate-altchars.xml b/java/res/values-pt-rPT/donottranslate-altchars.xml new file mode 100644 index 000000000..d3beafade --- /dev/null +++ b/java/res/values-pt-rPT/donottranslate-altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> +</resources> diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index f79ae8f41..522420845 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Avançados"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: guardada"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Mantenha uma tecla premida para ver os acentos (ø, ö, etc.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Prima a tecla de retrocesso ↶ para fechar o teclado a qualquer momento"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Aceder a números e símbolos"</string> diff --git a/java/res/values-pt/donottranslate-altchars.xml b/java/res/values-pt/donottranslate-altchars.xml new file mode 100644 index 000000000..d3beafade --- /dev/null +++ b/java/res/values-pt/donottranslate-altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóôõöœø9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> +</resources> diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index 5492da60c..12fb62b03 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Avançado"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Salvo"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Segure uma tecla pressionada para ver os acentos (ø, ö, etc.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Apertar a tecla voltar ↶ para fechar o teclado, em qualquer ponto"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Acessar números e símbolos"</string> diff --git a/java/res/values-rm/donottranslate-altchars.xml b/java/res/values-rm/donottranslate-altchars.xml new file mode 100644 index 000000000..f17026fa9 --- /dev/null +++ b/java/res/values-rm/donottranslate-altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">òóöôõœø9</string> + <string name="alternates_for_u">ùúûü7</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> +</resources> diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml index a93cd1f65..08c397202 100644 --- a/java/res/values-rm/strings.xml +++ b/java/res/values-rm/strings.xml @@ -58,15 +58,6 @@ <item msgid="4894328801530136615">"Avanzà"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Memorisà"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóöôõœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Tegnair smatgà per mussar ils accents (à, é, etc.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Smatgar ↶ per serrar la tastatura"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Acceder a cifras e simbols"</string> diff --git a/java/res/values-ru/donottranslate-altchars.xml b/java/res/values-ru/donottranslate-altchars.xml new file mode 100644 index 000000000..46241a62a --- /dev/null +++ b/java/res/values-ru/donottranslate-altchars.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">èéêë</string> + <string name="alternates_for_i">ìíîï</string> + <string name="alternates_for_o">òóôõöœø</string> + <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_cyrillic_e">ё5</string> + <string name="alternates_for_cyrillic_soft_sign">ъ</string> +</resources> diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index 91d9edf17..b35eb9ffb 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Дополнительно"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: сохранено"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Удерживайте клавишу, чтобы увидеть варианты с диакритическими знаками (ø, ö и т.д.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Нажмите клавишу \"Назад\" ↶, чтобы закрыть клавиатуру в любой момент"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Открыть цифры и символы"</string> diff --git a/java/res/values-sv/donottranslate-altchars.xml b/java/res/values-sv/donottranslate-altchars.xml new file mode 100644 index 000000000..4d26e6c47 --- /dev/null +++ b/java/res/values-sv/donottranslate-altchars.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">áàâąã</string> + <string name="alternates_for_e">3éèêëę€</string> + <string name="alternates_for_i">íìîï8</string> + <string name="alternates_for_o">óòôõ9</string> + <string name="alternates_for_u">úùûū7</string> + <string name="alternates_for_s">śšşß</string> + <string name="alternates_for_n">ńñň</string> + <string name="alternates_for_c">çćč</string> + <string name="alternates_for_y">ýÿü6</string> + <string name="alternates_for_d">ðď</string> + <string name="alternates_for_r">ř4</string> + <string name="alternates_for_t">ťþ5</string> + <string name="alternates_for_z">źžż</string> + <string name="alternates_for_l">ł</string> + <string name="alternates_for_v">w</string> + <string name="alternates_for_a_umlaut">æ</string> + <string name="alternates_for_o_umlaut">øœ</string> +</resources> diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index 86f375f14..59a0f8447 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Avancerade"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>: sparat"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Håll nere en tangent om du vill visa accenter (ø, ö, etc.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Tryck på Tillbaka ↶ om du vill stänga tangentbordet"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"För siffror och symboler"</string> diff --git a/java/res/values-tr/donottranslate.xml b/java/res/values-tr/donottranslate-altchars.xml index 2154c16bb..4200d949e 100644 --- a/java/res/values-tr/donottranslate.xml +++ b/java/res/values-tr/donottranslate-altchars.xml @@ -2,7 +2,7 @@ <!-- /* ** -** Copyright 2009, The Android Open Source Project +** Copyright 2010, 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. @@ -18,6 +18,14 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Accented characters related to "g" --> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">3èéêë</string> + <string name="alternates_for_i">ìíîï8</string> + <string name="alternates_for_o">öòóôõœø9</string> + <string name="alternates_for_u">üùúû7</string> + <string name="alternates_for_s">ş§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ6</string> <string name="alternates_for_g">ğ</string> </resources>
\ No newline at end of file diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index 34438f7f6..fbc268bdb 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"Gelişmiş"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g> : Kaydedildi"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"iìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"öòóôõœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"üùúû"</string> - <string name="alternates_for_s" msgid="348762530927662188">"ş§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"Vurguları görmek için bir tuşu basılı tutun (ø, ö, v.b.)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"Klavyeyi herhangi bir anda kapatmak için geri tuşuna ↶ basın"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"Sayılara ve simgelere erişin"</string> diff --git a/java/res/values-zh-rCN/donottranslate-altchars.xml b/java/res/values-zh-rCN/donottranslate-altchars.xml new file mode 100644 index 000000000..c165b11c5 --- /dev/null +++ b/java/res/values-zh-rCN/donottranslate-altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">èéêë</string> + <string name="alternates_for_i">ìíîï</string> + <string name="alternates_for_o">òóôõöœø</string> + <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ</string> +</resources> diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index c04f2e02b..05b80ccf5 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"高级"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>：已保存"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"按住某个键可看到重音符号（例如 ø、ö 等）"</string> <string name="tip_dismiss" msgid="7585579046862204381">"随时可以通过按后退键 ↶ 关闭键盘"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"访问数字和符号"</string> diff --git a/java/res/values-zh-rTW/donottranslate-altchars.xml b/java/res/values-zh-rTW/donottranslate-altchars.xml new file mode 100644 index 000000000..c165b11c5 --- /dev/null +++ b/java/res/values-zh-rTW/donottranslate-altchars.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">èéêë</string> + <string name="alternates_for_i">ìíîï</string> + <string name="alternates_for_o">òóôõöœø</string> + <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ</string> +</resources> diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index 54d93117e..8a96f8667 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -56,15 +56,6 @@ <item msgid="4894328801530136615">"進階模式"</item> </string-array> <string name="added_word" msgid="8993883354622484372">"<xliff:g id="WORD">%s</xliff:g>：已儲存"</string> - <string name="alternates_for_a" msgid="2566516493365324765">"àáâãäåæ"</string> - <string name="alternates_for_e" msgid="3900510936875547555">"èéêë"</string> - <string name="alternates_for_i" msgid="7097915268629342242">"ìíîï"</string> - <string name="alternates_for_o" msgid="6151402748321267776">"òóôõöœø"</string> - <string name="alternates_for_u" msgid="5899096818189442934">"ùúûü"</string> - <string name="alternates_for_s" msgid="348762530927662188">"§ß"</string> - <string name="alternates_for_n" msgid="6257322556221886400">"ñ"</string> - <string name="alternates_for_c" msgid="151699780720639892">"ç"</string> - <string name="alternates_for_y" msgid="1722776806607271199">"ýÿ"</string> <string name="tip_long_press" msgid="6101270866284343344">"按住按鍵可查看重音符號 (ø、ö 等)"</string> <string name="tip_dismiss" msgid="7585579046862204381">"隨時可以透過按後退鍵 ↶ 關閉鍵盤"</string> <string name="tip_access_symbols" msgid="6344098517525531652">"使用數字和符號"</string> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index e3171eb33..995373e84 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -43,6 +43,9 @@ <!-- Height of the key press feedback popup. --> <attr name="keyPreviewHeight" format="dimension" /> + <!-- Hysteresis distance for key debouncing --> + <attr name="keyHysteresisDistance" format="dimension" /> + <!-- Amount to offset the touch Y coordinate by, for bias correction. --> <attr name="verticalCorrection" format="dimension" /> diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml index 245648df2..0161589a4 100644 --- a/java/res/values/colors.xml +++ b/java/res/values/colors.xml @@ -19,8 +19,8 @@ --> <resources> <color name="candidate_normal">#FFFFFFFF</color> - <color name="candidate_recommended">#FFF07020</color> - <color name="candidate_other">#ffD06015</color> + <color name="candidate_recommended">#FFFCAE00</color> + <color name="candidate_other">#FFFCAE00</color> <color name="latinkeyboard_transparent">#00000000</color> <color name="latinkeyboard_bar_language_shadow_white">#80000000</color> <color name="latinkeyboard_bar_language_shadow_black">#80FFFFFF</color> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index 39dce9db0..b399af489 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -22,10 +22,13 @@ <dimen name="key_height">54dip</dimen> <dimen name="bubble_pointer_offset">22dip</dimen> <dimen name="candidate_strip_height">42dip</dimen> + <dimen name="candidate_strip_fading_edge_length">63dip</dimen> <dimen name="spacebar_vertical_correction">4dip</dimen> <!-- If the screen height in landscape is larger than the below value, then the keyboard will not go into extract (fullscreen) mode. --> <dimen name="max_height_for_fullscreen">2.5in</dimen> <dimen name="key_text_size">22sp</dimen> - <dimen name="key_debounce_hysteresis_distance">0.05in</dimen> + <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> + <!-- key_height * 1.7 --> + <dimen name="mini_keyboard_slide_allowance">91.8dip</dimen> </resources> diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml new file mode 100644 index 000000000..bba7282c9 --- /dev/null +++ b/java/res/values/donottranslate-altchars.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="alternates_for_a">àáâãäåæ</string> + <string name="alternates_for_e">èéêë</string> + <string name="alternates_for_i">ìíîï</string> + <string name="alternates_for_o">òóôõöœø</string> + <string name="alternates_for_u">ùúûü</string> + <string name="alternates_for_s">§ß</string> + <string name="alternates_for_n">ñ</string> + <string name="alternates_for_c">ç</string> + <string name="alternates_for_y">ýÿ</string> + <string name="alternates_for_q">1</string> + <string name="alternates_for_w">2</string> + <string name="alternates_for_d"></string> + <string name="alternates_for_r">4</string> + <string name="alternates_for_t">5</string> + <string name="alternates_for_z"></string> + <string name="alternates_for_l"></string> + <string name="alternates_for_g"></string> + <string name="alternates_for_p">0</string> + <string name="alternates_for_v"></string> + <string name="alternates_for_ae"></string> + <string name="alternates_for_oe"></string> + <string name="alternates_for_cyrillic_e"></string> + <string name="alternates_for_cyrillic_soft_sign"></string> + <string name="alternates_for_a_umlaut"></string> + <string name="alternates_for_o_umlaut"></string> +</resources> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 97b645c4a..936609924 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -24,22 +24,12 @@ <string name="sentence_separators">.,!?)</string> <!-- Symbols that are suggested between words --> <string name="suggested_punctuations">!?,\u0022\u0027:()-/@_</string> - <!-- Accented characters related to "q" --> - <string name="alternates_for_q">1</string> - <!-- Accented characters related to "w" --> - <string name="alternates_for_w">2</string> - <!-- Accented characters related to "d" --> - <string name="alternates_for_d"></string> - <!-- Accented characters related to "r" --> - <string name="alternates_for_r">4</string> - <!-- Accented characters related to "t" --> - <string name="alternates_for_t">5</string> - <!-- Accented characters related to "z" --> - <string name="alternates_for_z"></string> - <!-- Accented characters related to "l" --> - <string name="alternates_for_l"></string> - <!-- Accented characters related to "g" --> - <string name="alternates_for_g"></string> - <!-- Accented characters related to "p" --> - <string name="alternates_for_p">0</string> + + <!-- Option values to show/hide the settings key in onscreen keyboard --> + <!-- Automatically decide to show or hide the settings key --> + <string name="settings_key_mode_auto" translatable="false">0</string> + <!-- Always show the settings key --> + <string name="settings_key_mode_always_show" translatable="false">1</string> + <!-- Always hide the settings key --> + <string name="settings_key_mode_always_hide" translatable="false">2</string> </resources> diff --git a/java/res/values/keycodes.xml b/java/res/values/keycodes.xml index 3f03dd665..9dded508a 100644 --- a/java/res/values/keycodes.xml +++ b/java/res/values/keycodes.xml @@ -19,6 +19,12 @@ --> <resources> + <integer name="key_tab">9</integer> + <integer name="key_return">10</integer> + <integer name="key_space">32</integer> + <integer name="key_shift">-1</integer> + <integer name="key_symbol">-2</integer> + <integer name="key_delete">-5</integer> <!-- Keycode for F1 (function) key. This one switches between language switch & comma/.com --> <integer name="key_settings">-100</integer> <integer name="key_f1">-103</integer> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index d2febb566..3a3e1c9c2 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -91,6 +91,27 @@ <!-- Description for auto completion --> <string name="auto_complete_summary">Spacebar and punctuation automatically insert highlighted word</string> + <!-- Option to show/hide the settings key --> + <string name="prefs_settings_key">Show settings key</string> + <!-- Array of the settings key mode values --> + <string-array name="settings_key_modes_values" translatable="false"> + <item>@string/settings_key_mode_auto</item> + <item>@string/settings_key_mode_always_show</item> + <item>@string/settings_key_mode_always_hide</item> + </string-array> + <!-- Option to automatically decide to show/hide the settings key --> + <string name="settings_key_mode_auto_name">Automatic</string> + <!-- Option to always show the settings key --> + <string name="settings_key_mode_always_show_name">Always show</string> + <!-- Option to always hide the settings key --> + <string name="settings_key_mode_always_hide_name">Always hide</string> + <!-- Array of the settings key modes --> + <string-array name="settings_key_modes"> + <item>@string/settings_key_mode_auto_name</item> + <item>@string/settings_key_mode_always_show_name</item> + <item>@string/settings_key_mode_always_hide_name</item> + </string-array> + <!-- Option to enable bigram completion --> <string name="bigram_suggestion">Bigram Suggestions</string> <!-- Description for auto completion --> @@ -118,24 +139,6 @@ <!-- Indicates that a word has been added to the dictionary --> <string name="added_word"><xliff:g id="word">%s</xliff:g> : Saved</string> - <!-- Accented forms of "a" --> - <string name="alternates_for_a">àáâãäåæ</string> - <!-- Accented forms of "e" --> - <string name="alternates_for_e">èéêë</string> - <!-- Accented forms of "i" --> - <string name="alternates_for_i">ìíîï</string> - <!-- Accented forms of "o" --> - <string name="alternates_for_o">òóôõöœø</string> - <!-- Accented forms of "u" --> - <string name="alternates_for_u">ùúûü</string> - <!-- Letters associated with "s" --> - <string name="alternates_for_s">§ß</string> - <!-- Accented forms of "n" --> - <string name="alternates_for_n">ñ</string> - <!-- Accented forms of "c" --> - <string name="alternates_for_c">ç</string> - <!-- Accented forms of "y" --> - <string name="alternates_for_y">ýÿ</string> <!-- Tip to long press on keys --> <string name="tip_long_press">Hold a key down to see accents (ø, ö, etc.)</string> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 16478c883..60fffe873 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -21,11 +21,12 @@ <item name="keyBackground">@drawable/btn_keyboard_key</item> <item name="keyTextSize">@dimen/key_text_size</item> <item name="keyTextColor">#FFFFFFFF</item> - <item name="keyPreviewLayout">@layout/keyboard_key_preview</item> - <item name="keyPreviewOffset">5dip</item> + <item name="keyPreviewLayout">@layout/key_preview</item> + <item name="keyPreviewOffset">0dip</item> <item name="keyPreviewHeight">80dip</item> <item name="labelTextSize">14sp</item> - <item name="popupLayout">@layout/keyboard_popup_keyboard</item> + <item name="popupLayout">@layout/keyboard_popup</item> + <item name="keyHysteresisDistance">0.05in</item> <item name="verticalCorrection">-10dip</item> <item name="shadowColor">#BB000000</item> <item name="shadowRadius">2.75</item> diff --git a/java/res/xml-da/kbd_qwerty.xml b/java/res/xml-da/kbd_qwerty.xml index 57b013a9d..a17d604bf 100644 --- a/java/res/xml-da/kbd_qwerty.xml +++ b/java/res/xml-da/kbd_qwerty.xml @@ -24,187 +24,511 @@ Just a copy of the Norwegian layout, with æ/ø switched. --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="9.09%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="113" android:keyLabel="q" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="éèêëę€"/> - <Key android:codes="114" android:keyLabel="r" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ř"/> - <Key android:codes="116" android:keyLabel="t" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ťþ"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ýÿü"/> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="úùûū"/> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="íìîï"/> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="óòôõ"/> - <Key android:codes="112" android:keyLabel="p"/> - <Key android:keyLabel="å" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <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:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> + <Key + android:keyLabel="e" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> + <Key + android:keyLabel="å" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="97" android:keyLabel="a" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="áàâąã" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="śšşß"/> - <Key android:codes="100" android:keyLabel="d" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ðď"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ł"/> - <Key android:keyLabel="æ" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ä"/> - <Key android:keyLabel="ø" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="öœ" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:keyWidth="8.75%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" /> + <Key + android:keyLabel="æ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_ae" /> + <Key + android:keyLabel="ø" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_oe" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyWidth="10%p"> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="źžż"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="çćč"/> - <Key android:codes="118" android:keyLabel="v" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="w"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ńñň"/> - <Key android:codes="109" android:keyLabel="m"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" android:isModifier="true"/> + <Row + android:keyWidth="10%p" + > + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="m" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="\@" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-da/kbd_qwerty_black.xml b/java/res/xml-da/kbd_qwerty_black.xml index bde77d6dc..bab7db5d3 100644 --- a/java/res/xml-da/kbd_qwerty_black.xml +++ b/java/res/xml-da/kbd_qwerty_black.xml @@ -24,186 +24,453 @@ Just a copy of the Norwegian layout, with æ/ø switched. --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="9.09%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="113" android:keyLabel="q" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="éèêëę€"/> - <Key android:codes="114" android:keyLabel="r" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ř"/> - <Key android:codes="116" android:keyLabel="t" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ťþ"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ýÿü"/> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="úùûū"/> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="íìîï"/> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="óòôõ"/> - <Key android:codes="112" android:keyLabel="p"/> - <Key android:keyLabel="å" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <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:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> + <Key + android:keyLabel="e" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> + <Key + android:keyLabel="å" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="97" android:keyLabel="a" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="áàâąã" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="śšşß"/> - <Key android:codes="100" android:keyLabel="d" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ðď"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ł"/> - <Key android:keyLabel="æ" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ä"/> - <Key android:keyLabel="ø" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="öœ" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:keyWidth="8.75%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" /> + <Key + android:keyLabel="æ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_ae" /> + <Key + android:keyLabel="ø" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_oe" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyWidth="10%p"> - <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="źžż"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="çćč"/> - <Key android:codes="118" android:keyLabel="v" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="w"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ńñň"/> - <Key android:codes="109" android:keyLabel="m"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <Row + android:keyWidth="10%p" + > + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="m" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="\@"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="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 52ac24210..167f84c62 100755..100644 --- a/java/res/xml-de/kbd_qwerty.xml +++ b/java/res/xml-de/kbd_qwerty.xml @@ -18,173 +18,496 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_e" - /> - <Key android:codes="114" android:keyLabel="r"/> - <Key android:codes="116" android:keyLabel="t"/> - <Key android:codes="122" android:keyLabel="z" /> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_u" - /> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_i" - /> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_o" - /> - <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" + android:keyEdgeFlags="left" /> + <Key + 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" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_a" - android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_s" - /> - <Key android:codes="100" android:keyLabel="d"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:horizontalGap="5%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_y" - /> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_c" - /> - <Key android:codes="118" android:keyLabel="v"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_n" - /> - <Key android:codes="109" android:keyLabel="m"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" android:isModifier="true"/> + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="m" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="\@" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-de/kbd_qwerty_black.xml b/java/res/xml-de/kbd_qwerty_black.xml index 5e7261ae7..0ec39b9c8 100755..100644 --- a/java/res/xml-de/kbd_qwerty_black.xml +++ b/java/res/xml-de/kbd_qwerty_black.xml @@ -18,173 +18,438 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_e" - /> - <Key android:codes="114" android:keyLabel="r"/> - <Key android:codes="116" android:keyLabel="t"/> - <Key android:codes="122" android:keyLabel="z" /> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_u" - /> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_i" - /> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_o" - /> - <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" + android:keyEdgeFlags="left" /> + <Key + 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" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_a" - android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_s" - /> - <Key android:codes="100" android:keyLabel="d"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:horizontalGap="5%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_y" - /> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_c" - /> - <Key android:codes="118" android:keyLabel="v"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_n" - /> - <Key android:codes="109" android:keyLabel="m"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="m" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="\@"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="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 b4da9365a..a86ae1e1c 100644 --- a/java/res/xml-fr/kbd_qwerty.xml +++ b/java/res/xml-fr/kbd_qwerty.xml @@ -18,175 +18,497 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="97" android:keyLabel="a" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_a" - android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_e" - /> - <Key android:codes="114" android:keyLabel="r"/> - <Key android:codes="116" android:keyLabel="t"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_y" - /> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_u" - /> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_i" - /> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_o" - /> - <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="e" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_s" - /> - <Key android:codes="100" android:keyLabel="d"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l"/> - <Key android:codes="109" android:keyLabel="m" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" /> + <Key + android:keyLabel="m" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_c" - /> - <Key android:codes="118" android:keyLabel="v"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_n" - /> - <!--Key android:codes="233,224,232,234" android:keyLabel="é"/--> - <Key android:keyLabel="\'"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" android:isModifier="true"/> + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="\'" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="\@" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-fr/kbd_qwerty_black.xml b/java/res/xml-fr/kbd_qwerty_black.xml index c49d98212..f01c3a811 100644 --- a/java/res/xml-fr/kbd_qwerty_black.xml +++ b/java/res/xml-fr/kbd_qwerty_black.xml @@ -18,175 +18,439 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="97" android:keyLabel="a" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_a" - android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_e" - /> - <Key android:codes="114" android:keyLabel="r"/> - <Key android:codes="116" android:keyLabel="t"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_y" - /> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_u" - /> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_i" - /> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_o" - /> - <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="e" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_s" - /> - <Key android:codes="100" android:keyLabel="d"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l"/> - <Key android:codes="109" android:keyLabel="m" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" /> + <Key + android:keyLabel="m" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_c" - /> - <Key android:codes="118" android:keyLabel="v"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_n" - /> - <!--Key android:codes="233,224,232,234" android:keyLabel="é"/--> - <Key android:keyLabel="\'"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="w" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="\'" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="\@"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="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 c6b2056e2..c0b133976 100755..100644 --- a/java/res/xml-iw/kbd_qwerty.xml +++ b/java/res/xml-iw/kbd_qwerty.xml @@ -18,148 +18,455 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:keyLabel="ק" - android:horizontalGap="5%p" - android:keyEdgeFlags="left"/> - <Key android:keyLabel="ר"/> - <Key android:keyLabel="א"/> - <Key android:keyLabel="ט"/> - <Key android:keyLabel="ו"/> - <Key android:keyLabel="ן"/> - <Key android:keyLabel="ם"/> - <Key android:keyLabel="פ"/> - <Key android:codes="-5" - android:horizontalGap="1.25%p" - android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="13.75%p" android:keyEdgeFlags="right" + <Key + android:keyLabel="ק" + android:horizontalGap="5%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ר" /> + <Key + android:keyLabel="א" /> + <Key + android:keyLabel="ט" /> + <Key + android:keyLabel="ו" /> + <Key + android:keyLabel="ן" /> + <Key + android:keyLabel="ם" /> + <Key + android:keyLabel="פ" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" android:isModifier="true"/> + android:keyWidth="13.75%p" + android:isModifier="true" + android:horizontalGap="1.25%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:keyLabel="ש" android:keyEdgeFlags="left"/> - <Key android:keyLabel="ד"/> - <Key android:keyLabel="ג"/> - <Key android:keyLabel="כ"/> - <Key android:keyLabel="ע"/> - <Key android:keyLabel="י"/> - <Key android:keyLabel="ח"/> - <Key android:keyLabel="ל"/> - <Key android:keyLabel="ך"/> - <Key android:keyLabel="ף" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="ש" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ד" /> + <Key + android:keyLabel="ג" /> + <Key + android:keyLabel="כ" /> + <Key + android:keyLabel="ע" /> + <Key + android:keyLabel="י" /> + <Key + android:keyLabel="ח" /> + <Key + android:keyLabel="ל" /> + <Key + android:keyLabel="ך" /> + <Key + android:keyLabel="ף" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:keyLabel="ז" android:horizontalGap="5%p" android:keyEdgeFlags="left"/> - <Key android:keyLabel="ס"/> - <Key android:keyLabel="ב"/> - <Key android:keyLabel="ה"/> - <Key android:keyLabel="נ"/> - <Key android:keyLabel="מ"/> - <Key android:keyLabel="צ"/> - <Key android:keyLabel="ת"/> - <Key android:keyLabel="ץ" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="ז" + android:horizontalGap="5%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ס" /> + <Key + android:keyLabel="ב" /> + <Key + android:keyLabel="ה" /> + <Key + android:keyLabel="נ" /> + <Key + android:keyLabel="מ" /> + <Key + android:keyLabel="צ" /> + <Key + android:keyLabel="ת" /> + <Key + android:keyLabel="ץ" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="\@" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> - diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml index 8b64c82ad..b0ed519d2 100755..100644 --- a/java/res/xml-iw/kbd_qwerty_black.xml +++ b/java/res/xml-iw/kbd_qwerty_black.xml @@ -18,148 +18,397 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:keyLabel="ק" - android:horizontalGap="5%p" - android:keyEdgeFlags="left"/> - <Key android:keyLabel="ר"/> - <Key android:keyLabel="א"/> - <Key android:keyLabel="ט"/> - <Key android:keyLabel="ו"/> - <Key android:keyLabel="ן"/> - <Key android:keyLabel="ם"/> - <Key android:keyLabel="פ"/> - <Key android:codes="-5" - android:horizontalGap="1.25%p" - android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="13.75%p" android:keyEdgeFlags="right" + <Key + android:keyLabel="ק" + android:horizontalGap="5%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ר" /> + <Key + android:keyLabel="א" /> + <Key + android:keyLabel="ט" /> + <Key + android:keyLabel="ו" /> + <Key + android:keyLabel="ן" /> + <Key + android:keyLabel="ם" /> + <Key + android:keyLabel="פ" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + android:keyWidth="13.75%p" + android:horizontalGap="1.25%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:keyLabel="ש" android:keyEdgeFlags="left"/> - <Key android:keyLabel="ד"/> - <Key android:keyLabel="ג"/> - <Key android:keyLabel="כ"/> - <Key android:keyLabel="ע"/> - <Key android:keyLabel="י"/> - <Key android:keyLabel="ח"/> - <Key android:keyLabel="ל"/> - <Key android:keyLabel="ך"/> - <Key android:keyLabel="ף" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="ש" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ד" /> + <Key + android:keyLabel="ג" /> + <Key + android:keyLabel="כ" /> + <Key + android:keyLabel="ע" /> + <Key + android:keyLabel="י" /> + <Key + android:keyLabel="ח" /> + <Key + android:keyLabel="ל" /> + <Key + android:keyLabel="ך" /> + <Key + android:keyLabel="ף" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:keyLabel="ז" android:horizontalGap="5%p" android:keyEdgeFlags="left"/> - <Key android:keyLabel="ס"/> - <Key android:keyLabel="ב"/> - <Key android:keyLabel="ה"/> - <Key android:keyLabel="נ"/> - <Key android:keyLabel="מ"/> - <Key android:keyLabel="צ"/> - <Key android:keyLabel="ת"/> - <Key android:keyLabel="ץ" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="ז" + android:horizontalGap="5%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ס" /> + <Key + android:keyLabel="ב" /> + <Key + android:keyLabel="ה" /> + <Key + android:keyLabel="נ" /> + <Key + android:keyLabel="מ" /> + <Key + android:keyLabel="צ" /> + <Key + android:keyLabel="ת" /> + <Key + android:keyLabel="ץ" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="\@"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="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 7bc02ebe4..89d45468c 100644 --- a/java/res/xml-nb/kbd_qwerty.xml +++ b/java/res/xml-nb/kbd_qwerty.xml @@ -24,185 +24,511 @@ Just a copy of the Swedish layout, with ä/æ and ö/ø switched. --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="9.09%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="113" android:keyLabel="q" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="éèêëę€"/> - <Key android:codes="114" android:keyLabel="r" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ř"/> - <Key android:codes="116" android:keyLabel="t" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ťþ"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ýÿ"/> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="üúùûū"/> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="íìîï"/> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="öóòôõ"/> - <Key android:codes="112" android:keyLabel="p"/> - <Key android:keyLabel="å" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <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:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> + <Key + android:keyLabel="e" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> + <Key + android:keyLabel="å" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="97" android:keyLabel="a" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="äáàâąã" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="śšşß"/> - <Key android:codes="100" android:keyLabel="d" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ðď"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ł"/> - <Key android:keyLabel="ø" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="œ"/> - <Key android:keyLabel="æ" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:keyWidth="8.75%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" /> + <Key + android:keyLabel="ø" + android:popupKeyboard="@xml/kbd_popup_template" + 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> - - <Row android:keyWidth="10%p"> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="źžż"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="çćč"/> - <Key android:codes="118" android:keyLabel="v" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="w"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ńñň"/> - <Key android:codes="109" android:keyLabel="m"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" android:isModifier="true"/> + <Row + android:keyWidth="10%p" + > + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="m" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="\@" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + 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 e87452165..8fbfead79 100644 --- a/java/res/xml-nb/kbd_qwerty_black.xml +++ b/java/res/xml-nb/kbd_qwerty_black.xml @@ -24,185 +24,453 @@ Just a copy of the Swedish layout, with ä/æ and ö/ø switched. --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="9.09%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="113" android:keyLabel="q" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="éèêëę€"/> - <Key android:codes="114" android:keyLabel="r" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ř"/> - <Key android:codes="116" android:keyLabel="t" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ťþ"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ýÿ"/> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="üúùûū"/> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="íìîï"/> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="öóòôõ"/> - <Key android:codes="112" android:keyLabel="p"/> - <Key android:keyLabel="å" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <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:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> + <Key + android:keyLabel="e" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> + <Key + android:keyLabel="å" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="97" android:keyLabel="a" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="äáàâąã" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="śšşß"/> - <Key android:codes="100" android:keyLabel="d" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ðď"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ł"/> - <Key android:keyLabel="ø" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="œ"/> - <Key android:keyLabel="æ" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:keyWidth="8.75%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" /> + <Key + android:keyLabel="ø" + android:popupKeyboard="@xml/kbd_popup_template" + 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> - - <Row android:keyWidth="10%p"> - <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="źžż"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="çćč"/> - <Key android:codes="118" android:keyLabel="v" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="w"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ńñň"/> - <Key android:codes="109" android:keyLabel="m"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <Row + android:keyWidth="10%p" + > + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="m" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="\@"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="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 41d23b7d5..1877f838e 100755..100644 --- a/java/res/xml-ru/kbd_qwerty.xml +++ b/java/res/xml-ru/kbd_qwerty.xml @@ -18,160 +18,495 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="9.09%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:keyLabel="й" android:keyWidth="8.75%p" - android:keyEdgeFlags="left"/> - <Key android:keyLabel="ц"/> - <Key android:keyLabel="у"/> - <Key android:keyLabel="к"/> - <Key android:keyLabel="е" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ё" /> - <Key android:keyLabel="н"/> - <Key android:keyLabel="г"/> - <Key android:keyLabel="ш"/> - <Key android:keyLabel="щ"/> - <Key android:keyLabel="з"/> - <Key android:keyLabel="х" android:keyWidth="8.75%p" - android:keyEdgeFlags="right"/> + <Key + android:keyLabel="й" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="1" + android:keyWidth="8.75%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ц" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="2" /> + <Key + android:keyLabel="у" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="3" /> + <Key + android:keyLabel="к" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="4" /> + <Key + android:keyLabel="е" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_cyrillic_e" /> + <Key + android:keyLabel="н" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="6" /> + <Key + android:keyLabel="г" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="7" /> + <Key + android:keyLabel="ш" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="8" /> + <Key + android:keyLabel="щ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="9" /> + <Key + android:keyLabel="з" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="0" /> + <Key + android:keyLabel="х" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:keyLabel="ф" android:keyWidth="8.75%p" - android:keyEdgeFlags="left"/> - <Key android:keyLabel="ы"/> - <Key android:keyLabel="в"/> - <Key android:keyLabel="а"/> - <Key android:keyLabel="п"/> - <Key android:keyLabel="р"/> - <Key android:keyLabel="о"/> - <Key android:keyLabel="л"/> - <Key android:keyLabel="д"/> - <Key android:keyLabel="ж"/> - <Key android:keyLabel="э" android:keyWidth="8.75%p" - android:keyEdgeFlags="right"/> + <Key + android:keyLabel="ф" + android:keyWidth="8.75%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ы" /> + <Key + android:keyLabel="в" /> + <Key + android:keyLabel="а" /> + <Key + android:keyLabel="п" /> + <Key + android:keyLabel="р" /> + <Key + android:keyLabel="о" /> + <Key + android:keyLabel="л" /> + <Key + android:keyLabel="д" /> + <Key + android:keyLabel="ж" /> + <Key + android:keyLabel="э" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyWidth="8.5%p"> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" - android:keyWidth="11.75%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:keyLabel="я"/> - <Key android:keyLabel="ч"/> - <Key android:keyLabel="с"/> - <Key android:keyLabel="м"/> - <Key android:keyLabel="и"/> - <Key android:keyLabel="т"/> - <Key android:keyLabel="ь" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ъ" /> - <Key android:keyLabel="б"/> - <Key android:keyLabel="ю"/> - <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:isModifier="true"/> + <Row + android:keyWidth="8.5%p" + > + <Key + android:codes="@integer/key_shift" + android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" + android:keyWidth="11.75%p" + android:isModifier="true" + android:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="я" /> + <Key + android:keyLabel="ч" /> + <Key + android:keyLabel="с" /> + <Key + android:keyLabel="м" /> + <Key + android:keyLabel="и" /> + <Key + android:keyLabel="т" /> + <Key + android:keyLabel="ь" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_cyrillic_soft_sign" /> + <Key + android:keyLabel="б" /> + <Key + android:keyLabel="ю" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="11.75%p" + android:isModifier="true" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="\@" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> - diff --git a/java/res/xml-ru/kbd_qwerty_black.xml b/java/res/xml-ru/kbd_qwerty_black.xml index 241c8524e..ebf78ce97 100755..100644 --- a/java/res/xml-ru/kbd_qwerty_black.xml +++ b/java/res/xml-ru/kbd_qwerty_black.xml @@ -18,159 +18,437 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="9.09%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:keyLabel="й" android:keyWidth="8.75%p" - android:keyEdgeFlags="left"/> - <Key android:keyLabel="ц"/> - <Key android:keyLabel="у"/> - <Key android:keyLabel="к"/> - <Key android:keyLabel="е" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ё" /> - <Key android:keyLabel="н"/> - <Key android:keyLabel="г"/> - <Key android:keyLabel="ш"/> - <Key android:keyLabel="щ"/> - <Key android:keyLabel="з"/> - <Key android:keyLabel="х" android:keyWidth="8.75%p" - android:keyEdgeFlags="right"/> + <Key + android:keyLabel="й" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="1" + android:keyWidth="8.75%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ц" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="2" /> + <Key + android:keyLabel="у" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="3" /> + <Key + android:keyLabel="к" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="4" /> + <Key + android:keyLabel="е" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_cyrillic_e" /> + <Key + android:keyLabel="н" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="6" /> + <Key + android:keyLabel="г" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="7" /> + <Key + android:keyLabel="ш" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="8" /> + <Key + android:keyLabel="щ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="9" /> + <Key + android:keyLabel="з" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="0" /> + <Key + android:keyLabel="х" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:keyLabel="ф" android:keyWidth="8.75%p" - android:keyEdgeFlags="left"/> - <Key android:keyLabel="ы"/> - <Key android:keyLabel="в"/> - <Key android:keyLabel="а"/> - <Key android:keyLabel="п"/> - <Key android:keyLabel="р"/> - <Key android:keyLabel="о"/> - <Key android:keyLabel="л"/> - <Key android:keyLabel="д"/> - <Key android:keyLabel="ж"/> - <Key android:keyLabel="э" android:keyWidth="8.75%p" - android:keyEdgeFlags="right"/> + <Key + android:keyLabel="ф" + android:keyWidth="8.75%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ы" /> + <Key + android:keyLabel="в" /> + <Key + android:keyLabel="а" /> + <Key + android:keyLabel="п" /> + <Key + android:keyLabel="р" /> + <Key + android:keyLabel="о" /> + <Key + android:keyLabel="л" /> + <Key + android:keyLabel="д" /> + <Key + android:keyLabel="ж" /> + <Key + android:keyLabel="э" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyWidth="8.5%p"> - <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift" - android:keyWidth="11.75%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:keyLabel="я"/> - <Key android:keyLabel="ч"/> - <Key android:keyLabel="с"/> - <Key android:keyLabel="м"/> - <Key android:keyLabel="и"/> - <Key android:keyLabel="т"/> - <Key android:keyLabel="ь" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ъ" /> - <Key android:keyLabel="б"/> - <Key android:keyLabel="ю"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="11.75%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <Row + android:keyWidth="8.5%p" + > + <Key + android:codes="@integer/key_shift" + android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" + android:keyWidth="11.75%p" + android:isModifier="true" + android:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="я" /> + <Key + android:keyLabel="ч" /> + <Key + android:keyLabel="с" /> + <Key + android:keyLabel="м" /> + <Key + android:keyLabel="и" /> + <Key + android:keyLabel="т" /> + <Key + android:keyLabel="ь" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_cyrillic_soft_sign" /> + <Key + android:keyLabel="б" /> + <Key + android:keyLabel="ю" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="11.75%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="\@"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="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 78852fc22..ba8bf8c7d 100644 --- a/java/res/xml-sr/kbd_qwerty.xml +++ b/java/res/xml-sr/kbd_qwerty.xml @@ -19,154 +19,487 @@ --> <!-- Serbian keyboard layout, based on the X11 layout for Serbian --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="9.09%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:keyLabel="љ" - android:keyEdgeFlags="left" /> - <Key android:keyLabel="њ" /> - <Key android:keyLabel="е" /> - <Key android:keyLabel="р" /> - <Key android:keyLabel="т" /> - <Key android:keyLabel="з" /> - <Key android:keyLabel="у" /> - <Key android:keyLabel="и" /> - <Key android:keyLabel="о" /> - <Key android:keyLabel="п" /> - <Key android:keyLabel="ш" - android:keyEdgeFlags="right" /> + <Key + android:keyLabel="љ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="1" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="њ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="2" /> + <Key + android:keyLabel="е" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="3" /> + <Key + android:keyLabel="р" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="4" /> + <Key + android:keyLabel="т" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="5" /> + <Key + android:keyLabel="з" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="6" /> + <Key + android:keyLabel="у" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="7" /> + <Key + android:keyLabel="и" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="8" /> + <Key + android:keyLabel="о" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="9" /> + <Key + android:keyLabel="п" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="0" /> + <Key + android:keyLabel="ш" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:keyLabel="а" - android:keyEdgeFlags="left" /> - <Key android:keyLabel="с" /> - <Key android:keyLabel="д" /> - <Key android:keyLabel="ф" /> - <Key android:keyLabel="г" /> - <Key android:keyLabel="х" /> - <Key android:keyLabel="ј" /> - <Key android:keyLabel="к" /> - <Key android:keyLabel="л" /> - <Key android:keyLabel="ч" /> - <Key android:keyLabel="ћ" /> - <Key android:keyLabel="ђ" - android:keyEdgeFlags="right" /> + <Key + android:keyLabel="а" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="с" /> + <Key + android:keyLabel="д" /> + <Key + android:keyLabel="ф" /> + <Key + android:keyLabel="г" /> + <Key + android:keyLabel="х" /> + <Key + android:keyLabel="ј" /> + <Key + android:keyLabel="к" /> + <Key + android:keyLabel="л" /> + <Key + android:keyLabel="ч" /> + <Key + android:keyLabel="ћ" /> + <Key + android:keyLabel="ђ" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyWidth="8.5%p"> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" - android:keyWidth="11.75%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:keyLabel="ж" /> - <Key android:keyLabel="џ" /> - <Key android:keyLabel="ц" /> - <Key android:keyLabel="в" /> - <Key android:keyLabel="б" /> - <Key android:keyLabel="н" /> - <Key android:keyLabel="м" /> - <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:isModifier="true"/> + <Row + android:keyWidth="8.5%p" + > + <Key + android:codes="@integer/key_shift" + android:keyIcon="@drawable/sym_keyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" + android:keyWidth="11.75%p" + android:isModifier="true" + android:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ж" /> + <Key + android:keyLabel="џ" /> + <Key + android:keyLabel="ц" /> + <Key + android:keyLabel="в" /> + <Key + android:keyLabel="б" /> + <Key + android:keyLabel="н" /> + <Key + android:keyLabel="м" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="11.75%p" + android:isModifier="true" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="\@" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-sr/kbd_qwerty_black.xml b/java/res/xml-sr/kbd_qwerty_black.xml index c61e0ce2a..1bfb58e48 100644 --- a/java/res/xml-sr/kbd_qwerty_black.xml +++ b/java/res/xml-sr/kbd_qwerty_black.xml @@ -19,154 +19,429 @@ --> <!-- Serbian keyboard layout, based on the X11 layout for Serbian --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="9.09%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:keyLabel="љ" - android:keyEdgeFlags="left" /> - <Key android:keyLabel="њ" /> - <Key android:keyLabel="е" /> - <Key android:keyLabel="р" /> - <Key android:keyLabel="т" /> - <Key android:keyLabel="з" /> - <Key android:keyLabel="у" /> - <Key android:keyLabel="и" /> - <Key android:keyLabel="о" /> - <Key android:keyLabel="п" /> - <Key android:keyLabel="ш" - android:keyEdgeFlags="right" /> + <Key + android:keyLabel="љ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="1" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="њ" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="2" /> + <Key + android:keyLabel="е" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="3" /> + <Key + android:keyLabel="р" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="4" /> + <Key + android:keyLabel="т" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="5" /> + <Key + android:keyLabel="з" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="6" /> + <Key + android:keyLabel="у" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="7" /> + <Key + android:keyLabel="и" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="8" /> + <Key + android:keyLabel="о" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="9" /> + <Key + android:keyLabel="п" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="0" /> + <Key + android:keyLabel="ш" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:keyLabel="а" - android:keyEdgeFlags="left" /> - <Key android:keyLabel="с" /> - <Key android:keyLabel="д" /> - <Key android:keyLabel="ф" /> - <Key android:keyLabel="г" /> - <Key android:keyLabel="х" /> - <Key android:keyLabel="ј" /> - <Key android:keyLabel="к" /> - <Key android:keyLabel="л" /> - <Key android:keyLabel="ч" /> - <Key android:keyLabel="ћ" /> - <Key android:keyLabel="ђ" - android:keyEdgeFlags="right" /> + <Key + android:keyLabel="а" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="с" /> + <Key + android:keyLabel="д" /> + <Key + android:keyLabel="ф" /> + <Key + android:keyLabel="г" /> + <Key + android:keyLabel="х" /> + <Key + android:keyLabel="ј" /> + <Key + android:keyLabel="к" /> + <Key + android:keyLabel="л" /> + <Key + android:keyLabel="ч" /> + <Key + android:keyLabel="ћ" /> + <Key + android:keyLabel="ђ" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyWidth="8.5%p"> - <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift" - android:keyWidth="11.75%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:keyLabel="ж" /> - <Key android:keyLabel="џ" /> - <Key android:keyLabel="ц" /> - <Key android:keyLabel="в" /> - <Key android:keyLabel="б" /> - <Key android:keyLabel="н" /> - <Key android:keyLabel="м" /> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="11.75%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <Row + android:keyWidth="8.5%p" + > + <Key + android:codes="@integer/key_shift" + android:keyIcon="@drawable/sym_bkeyboard_shift" + android:iconPreview="@drawable/sym_keyboard_feedback_shift" + android:keyWidth="11.75%p" + android:isModifier="true" + android:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="ж" /> + <Key + android:keyLabel="џ" /> + <Key + android:keyLabel="ц" /> + <Key + android:keyLabel="в" /> + <Key + android:keyLabel="б" /> + <Key + android:keyLabel="н" /> + <Key + android:keyLabel="м" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="11.75%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="\@"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="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 bd5c67631..32a6add89 100644 --- a/java/res/xml-sv/kbd_qwerty.xml +++ b/java/res/xml-sv/kbd_qwerty.xml @@ -26,187 +26,510 @@ Local additions: €ß --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="9.09%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="113" android:keyLabel="q" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="éèêëę€"/> - <Key android:codes="114" android:keyLabel="r" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ř"/> - <Key android:codes="116" android:keyLabel="t" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ťþ"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ýÿü"/> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="úùûū"/> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="íìîï"/> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="óòôõ"/> - <Key android:codes="112" android:keyLabel="p"/> - <Key android:keyLabel="å" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <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:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> + <Key + android:keyLabel="e" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> + <Key + android:keyLabel="å" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="97" android:keyLabel="a" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="áàâąã" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="śšşß"/> - <Key android:codes="100" android:keyLabel="d" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ðď"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ł"/> - <Key android:keyLabel="ö" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="øœ"/> - <Key android:keyLabel="ä" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="æ" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:keyWidth="8.75%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" /> + <Key + android:keyLabel="ö" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o_umlaut" /> + <Key + android:keyLabel="ä" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a_umlaut" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyWidth="10%p"> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="źžż"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="çćč"/> - <Key android:codes="118" android:keyLabel="v" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="w"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ńñň"/> - <Key android:codes="109" android:keyLabel="m"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <Row + android:keyWidth="10%p" + > + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="m" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="\@" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml-sv/kbd_qwerty_black.xml b/java/res/xml-sv/kbd_qwerty_black.xml index dccc63a65..56050e9d0 100644 --- a/java/res/xml-sv/kbd_qwerty_black.xml +++ b/java/res/xml-sv/kbd_qwerty_black.xml @@ -26,187 +26,453 @@ Local additions: €ß --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="9.09%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="113" android:keyLabel="q" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="éèêëę€"/> - <Key android:codes="114" android:keyLabel="r" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ř"/> - <Key android:codes="116" android:keyLabel="t" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ťþ"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ýÿü"/> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="úùûū"/> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="íìîï"/> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="óòôõ"/> - <Key android:codes="112" android:keyLabel="p"/> - <Key android:keyLabel="å" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <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:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_w" /> + <Key + android:keyLabel="e" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" /> + <Key + android:keyLabel="å" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="97" android:keyLabel="a" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="áàâąã" - android:keyWidth="8.75%p" android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="śšşß"/> - <Key android:codes="100" android:keyLabel="d" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ðď"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ł"/> - <Key android:keyLabel="ö" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="øœ"/> - <Key android:keyLabel="ä" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="æ" - android:keyWidth="8.75%p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:keyWidth="8.75%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" /> + <Key + android:keyLabel="ö" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o_umlaut" /> + <Key + android:keyLabel="ä" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a_umlaut" + android:keyWidth="8.75%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyWidth="10%p"> - <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="źžż"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="çćč"/> - <Key android:codes="118" android:keyLabel="v" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="w"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ńñň"/> - <Key android:codes="109" android:keyLabel="m"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <Row + android:keyWidth="10%p" + > + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="m" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_url" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="\@"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_email" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_im" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:keyWidth="10%p" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/azerty.xml b/java/res/xml/azerty.xml deleted file mode 100644 index 614aa4936..000000000 --- a/java/res/xml/azerty.xml +++ /dev/null @@ -1,114 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2008, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" - android:keyWidth="10%p" - android:horizontalGap="0px" - android:verticalGap="0px" - android:keyHeight="@dimen/key_height" - > - - <Row> - <Key android:codes="97" android:keyLabel="a" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_a" - android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z"/> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_e" - /> - <Key android:codes="114" android:keyLabel="r"/> - <Key android:codes="116" android:keyLabel="t"/> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_y" - /> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_u" - /> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_i" - /> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_o" - /> - <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right"/> - </Row> - - <Row> - <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_s" - /> - <Key android:codes="100" android:keyLabel="d"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g"/> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l"/> - <Key android:codes="109" android:keyLabel="m" android:keyEdgeFlags="right"/> - </Row> - - <Row> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="119" android:keyLabel="w"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_c" - /> - <Key android:codes="118" android:keyLabel="v"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_n" - /> - <Key android:codes="233,224,232,234" android:keyLabel="é"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> - </Row> - - <Row android:rowEdgeFlags="bottom"> - <Key android:codes="-3" android:keyIcon="@drawable/sym_keyboard_done" - android:iconPreview="@drawable/sym_keyboard_feedback_done" - android:keyWidth="20%p" android:keyEdgeFlags="left"/> - <Key android:codes="-2" android:keyLabel="123" android:keyWidth="15%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46,44" android:keyLabel=". ," - android:popupKeyboard="@xml/popup_punctuation" android:keyWidth="15%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="20%p" android:keyEdgeFlags="right"/> - </Row> -</Keyboard> -
\ No newline at end of file diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml index 73d022fcb..9f381b905 100755..100644 --- a/java/res/xml/kbd_phone.xml +++ b/java/res/xml/kbd_phone.xml @@ -17,49 +17,85 @@ ** limitations under the License. */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" + +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="26.67%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top" > - - <Row> - <Key android:codes="49" android:keyIcon="@drawable/sym_keyboard_num1" android:keyEdgeFlags="left"/> - <Key android:codes="50" android:keyIcon="@drawable/sym_keyboard_num2"/> - <Key android:codes="51" android:keyIcon="@drawable/sym_keyboard_num3"/> - <Key android:keyLabel="-" android:keyWidth="20%p" android:keyEdgeFlags="right"/> + <Key + android:codes="49" + android:keyIcon="@drawable/sym_keyboard_num1" + android:keyEdgeFlags="left" /> + <Key + android:codes="50" + android:keyIcon="@drawable/sym_keyboard_num2" /> + <Key + android:codes="51" + android:keyIcon="@drawable/sym_keyboard_num3" /> + <Key + android:keyLabel="-" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="52" android:keyIcon="@drawable/sym_keyboard_num4" android:keyEdgeFlags="left"/> - <Key android:codes="53" android:keyIcon="@drawable/sym_keyboard_num5"/> - <Key android:codes="54" android:keyIcon="@drawable/sym_keyboard_num6"/> - <Key android:keyLabel="." android:keyWidth="20%p" android:keyEdgeFlags="right"/> + <Key + android:codes="52" + android:keyIcon="@drawable/sym_keyboard_num4" + android:keyEdgeFlags="left" /> + <Key + android:codes="53" + android:keyIcon="@drawable/sym_keyboard_num5" /> + <Key + android:codes="54" + android:keyIcon="@drawable/sym_keyboard_num6" /> + <Key + android:keyLabel="." + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="55" android:keyIcon="@drawable/sym_keyboard_num7" android:keyEdgeFlags="left"/> - <Key android:codes="56" android:keyIcon="@drawable/sym_keyboard_num8"/> - <Key android:codes="57" android:keyIcon="@drawable/sym_keyboard_num9"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:keyWidth="20%p" - android:isRepeatable="true" android:keyEdgeFlags="right"/> + <Key + android:codes="55" + android:keyIcon="@drawable/sym_keyboard_num7" + android:keyEdgeFlags="left" /> + <Key + android:codes="56" + android:keyIcon="@drawable/sym_keyboard_num8" /> + <Key + android:codes="57" + android:keyIcon="@drawable/sym_keyboard_num9" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="20%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyIcon="@drawable/sym_keyboard_numalt" - android:iconPreview="@drawable/sym_keyboard_feedback_numalt"/> - - <Key android:codes="48" android:keyIcon="@drawable/sym_keyboard_num0"/> - - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:isRepeatable="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:keyWidth="20%p" - android:keyEdgeFlags="right"/> + <Row + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyIcon="@drawable/sym_keyboard_numalt" + android:iconPreview="@drawable/sym_keyboard_feedback_numalt" /> + <Key + android:codes="48" + android:keyIcon="@drawable/sym_keyboard_num0" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - -</Keyboard>
\ No newline at end of file +</Keyboard> diff --git a/java/res/xml/kbd_phone_black.xml b/java/res/xml/kbd_phone_black.xml index 3738f2b68..7a956b796 100755..100644 --- a/java/res/xml/kbd_phone_black.xml +++ b/java/res/xml/kbd_phone_black.xml @@ -17,49 +17,85 @@ ** limitations under the License. */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" + +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="26.67%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top" > - - <Row> - <Key android:codes="49" android:keyIcon="@drawable/sym_bkeyboard_num1" android:keyEdgeFlags="left"/> - <Key android:codes="50" android:keyIcon="@drawable/sym_bkeyboard_num2"/> - <Key android:codes="51" android:keyIcon="@drawable/sym_bkeyboard_num3"/> - <Key android:keyLabel="-" android:keyWidth="20%p" android:keyEdgeFlags="right"/> + <Key + android:codes="49" + android:keyIcon="@drawable/sym_bkeyboard_num1" + android:keyEdgeFlags="left" /> + <Key + android:codes="50" + android:keyIcon="@drawable/sym_bkeyboard_num2" /> + <Key + android:codes="51" + android:keyIcon="@drawable/sym_bkeyboard_num3" /> + <Key + android:keyLabel="-" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="52" android:keyIcon="@drawable/sym_bkeyboard_num4" android:keyEdgeFlags="left"/> - <Key android:codes="53" android:keyIcon="@drawable/sym_bkeyboard_num5"/> - <Key android:codes="54" android:keyIcon="@drawable/sym_bkeyboard_num6"/> - <Key android:keyLabel="." android:keyWidth="20%p" android:keyEdgeFlags="right"/> + <Key + android:codes="52" + android:keyIcon="@drawable/sym_bkeyboard_num4" + android:keyEdgeFlags="left" /> + <Key + android:codes="53" + android:keyIcon="@drawable/sym_bkeyboard_num5" /> + <Key + android:codes="54" + android:keyIcon="@drawable/sym_bkeyboard_num6" /> + <Key + android:keyLabel="." + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="55" android:keyIcon="@drawable/sym_bkeyboard_num7" android:keyEdgeFlags="left"/> - <Key android:codes="56" android:keyIcon="@drawable/sym_bkeyboard_num8"/> - <Key android:codes="57" android:keyIcon="@drawable/sym_bkeyboard_num9"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:keyWidth="20%p" - android:isRepeatable="true" android:keyEdgeFlags="right"/> + <Key + android:codes="55" + android:keyIcon="@drawable/sym_bkeyboard_num7" + android:keyEdgeFlags="left" /> + <Key + android:codes="56" + android:keyIcon="@drawable/sym_bkeyboard_num8" /> + <Key + android:codes="57" + android:keyIcon="@drawable/sym_bkeyboard_num9" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="20%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyIcon="@drawable/sym_bkeyboard_numalt" - android:iconPreview="@drawable/sym_keyboard_feedback_numalt"/> - - <Key android:codes="48" android:keyIcon="@drawable/sym_bkeyboard_num0"/> - - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:isRepeatable="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:keyWidth="20%p" - android:keyEdgeFlags="right"/> + <Row + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyIcon="@drawable/sym_bkeyboard_numalt" + android:iconPreview="@drawable/sym_keyboard_feedback_numalt" /> + <Key + android:codes="48" + android:keyIcon="@drawable/sym_bkeyboard_num0" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - </Keyboard> diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml index 9196df8da..598e211f5 100755..100644 --- a/java/res/xml/kbd_phone_symbols.xml +++ b/java/res/xml/kbd_phone_symbols.xml @@ -18,51 +18,81 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="26.67%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top" > - - <Row> - <Key android:keyLabel="(" android:keyEdgeFlags="left"/> - <Key android:keyLabel="/"/> - <Key android:keyLabel=")"/> - <Key android:keyLabel="-" android:keyWidth="20%p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="(" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:keyLabel=")" /> + <Key + android:keyLabel="-" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:keyLabel="N" android:keyEdgeFlags="left"/> - <!-- Pause is a comma. - Check PhoneNumberUtils.java to see if this has changed. --> - <Key android:codes="44" android:keyLabel="Pause"/> - <Key android:keyLabel=","/> - <Key android:keyLabel="." android:keyWidth="20%p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="N" + android:keyEdgeFlags="left" /> + <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this + has changed. --> + <Key + android:codes="44" + android:keyLabel="Pause" /> + <Key + android:keyLabel="," /> + <Key + android:keyLabel="." + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="42" android:keyIcon="@drawable/sym_keyboard_numstar" - android:keyEdgeFlags="left"/> + <Key + android:codes="42" + android:keyIcon="@drawable/sym_keyboard_numstar" + android:keyEdgeFlags="left" /> <!-- Wait is a semicolon. --> - <Key android:codes="59" android:keyLabel="Wait"/> - <Key android:codes="35" android:keyIcon="@drawable/sym_keyboard_numpound"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:keyWidth="20%p" - android:isRepeatable="true" android:keyEdgeFlags="right"/> + <Key + android:codes="59" + android:keyLabel="Wait" /> + <Key + android:codes="35" + android:keyIcon="@drawable/sym_keyboard_numpound" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="20%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_phone_key" - android:keyEdgeFlags="left"/> - <Key android:keyLabel="+"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:isRepeatable="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:keyWidth="20%p" - android:keyEdgeFlags="right"/> + <Row + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_phone_key" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="+" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - -</Keyboard>
\ No newline at end of file +</Keyboard> diff --git a/java/res/xml/kbd_phone_symbols_black.xml b/java/res/xml/kbd_phone_symbols_black.xml index b996e8b31..5bc628965 100755..100644 --- a/java/res/xml/kbd_phone_symbols_black.xml +++ b/java/res/xml/kbd_phone_symbols_black.xml @@ -18,51 +18,81 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="26.67%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top" > - - <Row> - <Key android:keyLabel="(" android:keyEdgeFlags="left"/> - <Key android:keyLabel="/"/> - <Key android:keyLabel=")"/> - <Key android:keyLabel="-" android:keyWidth="20%p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="(" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:keyLabel=")" /> + <Key + android:keyLabel="-" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:keyLabel="N" android:keyEdgeFlags="left"/> - <!-- Pause is a comma. - Check PhoneNumberUtils.java to see if this has changed. --> - <Key android:codes="44" android:keyLabel="Pause"/> - <Key android:keyLabel=","/> - <Key android:keyLabel="." android:keyWidth="20%p" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="N" + android:keyEdgeFlags="left" /> + <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this + has changed. --> + <Key + android:codes="44" + android:keyLabel="Pause" /> + <Key + android:keyLabel="," /> + <Key + android:keyLabel="." + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="42" android:keyIcon="@drawable/sym_bkeyboard_numstar" - android:keyEdgeFlags="left"/> + <Key + android:codes="42" + android:keyIcon="@drawable/sym_bkeyboard_numstar" + android:keyEdgeFlags="left" /> <!-- Wait is a semicolon. --> - <Key android:codes="59" android:keyLabel="Wait"/> - <Key android:codes="35" android:keyIcon="@drawable/sym_bkeyboard_numpound"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:keyWidth="20%p" - android:isRepeatable="true" android:keyEdgeFlags="right"/> + <Key + android:codes="59" + android:keyLabel="Wait" /> + <Key + android:codes="35" + android:keyIcon="@drawable/sym_bkeyboard_numpound" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="20%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_phone_key" - android:keyEdgeFlags="left"/> - <Key android:keyLabel="+"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:isRepeatable="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:keyWidth="20%p" - android:keyEdgeFlags="right"/> + <Row + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_phone_key" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="+" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - </Keyboard> diff --git a/java/res/xml/kbd_qwerty.xml b/java/res/xml/kbd_qwerty.xml index c75e27afb..ca9f99a31 100755..100644 --- a/java/res/xml/kbd_qwerty.xml +++ b/java/res/xml/kbd_qwerty.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -/* +/* ** ** Copyright 2008, The Android Open Source Project ** @@ -18,201 +18,486 @@ */ --> -<!-- 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" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_q" - /> - <Key android:codes="119" android:keyLabel="w" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_w" - /> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_e" - /> - <Key android:codes="114" android:keyLabel="r" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_r" - /> - <Key android:codes="116" android:keyLabel="t" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_t" - /> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_y" - /> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_u" - /> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_i" - /> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_o" - /> - <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_p" - /> + <Key + android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" + android:keyEdgeFlags="left" /> + <Key + 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" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_a" - android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_s" - /> - <Key android:codes="100" android:keyLabel="d" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_d"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_g" - /> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_l" - android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:horizontalGap="5%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="-1" android:keyIcon="@drawable/sym_keyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_z"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_c" - /> - <Key android:codes="118" android:keyLabel="v"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_n" - /> - <Key android:codes="109" android:keyLabel="m"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" android:isModifier="true"/> + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="m" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_url" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="\@" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_email" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_im" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_keyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_keyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right" android:isModifier="true"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="/" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="\@" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_keyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_keyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/kbd_qwerty_black.xml b/java/res/xml/kbd_qwerty_black.xml index 06bc102bb..fa300a034 100755..100644 --- a/java/res/xml/kbd_qwerty_black.xml +++ b/java/res/xml/kbd_qwerty_black.xml @@ -18,198 +18,428 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" - > - +> <Row> - <Key android:codes="113" android:keyLabel="q" android:keyEdgeFlags="left" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_q" - /> - <Key android:codes="119" android:keyLabel="w" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_w" - /> - <Key android:codes="101" android:keyLabel="e" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_e" - /> - <Key android:codes="114" android:keyLabel="r" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_r" - /> - <Key android:codes="116" android:keyLabel="t" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_t" - /> - <Key android:codes="121" android:keyLabel="y" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_y" - /> - <Key android:codes="117" android:keyLabel="u" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_u" - /> - <Key android:codes="105" android:keyLabel="i" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_i" - /> - <Key android:codes="111" android:keyLabel="o" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_o" - /> - <Key android:codes="112" android:keyLabel="p" android:keyEdgeFlags="right" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_p" - /> + <Key + android:keyLabel="q" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_q" + android:keyEdgeFlags="left" /> + <Key + 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" + android:popupCharacters="@string/alternates_for_e" /> + <Key + android:keyLabel="r" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_r" /> + <Key + android:keyLabel="t" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_t" /> + <Key + android:keyLabel="y" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_y" /> + <Key + android:keyLabel="u" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_u" /> + <Key + android:keyLabel="i" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_i" /> + <Key + android:keyLabel="o" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_o" /> + <Key + android:keyLabel="p" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_p" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="97" android:keyLabel="a" android:horizontalGap="5%p" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_a" - android:keyEdgeFlags="left"/> - <Key android:codes="115" android:keyLabel="s" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_s" - /> - <Key android:codes="100" android:keyLabel="d" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_d"/> - <Key android:codes="102" android:keyLabel="f"/> - <Key android:codes="103" android:keyLabel="g" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_g" - /> - <Key android:codes="104" android:keyLabel="h"/> - <Key android:codes="106" android:keyLabel="j"/> - <Key android:codes="107" android:keyLabel="k"/> - <Key android:codes="108" android:keyLabel="l" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_l" - android:keyEdgeFlags="right"/> + <Key + android:keyLabel="a" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_a" + android:horizontalGap="5%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="s" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_s" /> + <Key + android:keyLabel="d" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_d" /> + <Key + android:keyLabel="f" /> + <Key + android:keyLabel="g" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_g" /> + <Key + android:keyLabel="h" /> + <Key + android:keyLabel="j" /> + <Key + android:keyLabel="k" /> + <Key + android:keyLabel="l" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_l" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="-1" android:keyIcon="@drawable/sym_bkeyboard_shift" - android:keyWidth="15%p" android:isModifier="true" - android:iconPreview="@drawable/sym_keyboard_feedback_shift" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="122" android:keyLabel="z" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_z"/> - <Key android:codes="120" android:keyLabel="x"/> - <Key android:codes="99" android:keyLabel="c" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_c" - /> - <Key android:codes="118" android:keyLabel="v"/> - <Key android:codes="98" android:keyLabel="b"/> - <Key android:codes="110" android:keyLabel="n" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="@string/alternates_for_n" - /> - <Key android:codes="109" android:keyLabel="m"/> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" - android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <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:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="z" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_z" /> + <Key + android:keyLabel="x" /> + <Key + android:keyLabel="c" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_c" /> + <Key + android:keyLabel="v" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_v" /> + <Key + android:keyLabel="b" /> + <Key + android:keyLabel="n" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="@string/alternates_for_n" /> + <Key + android:keyLabel="m" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_normal" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_normal" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_url" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="/" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_url" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_email" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="\@"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_email" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_im" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " - android:popupKeyboard="@xml/popup_smileys" - android:keyWidth="25%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_im" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> </Row> - - <Row android:keyboardMode="@+id/mode_webentry" android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_symbol_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyIcon="@drawable/sym_bkeyboard_mic" - android:iconPreview="@drawable/sym_keyboard_feedback_mic" - android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:keyWidth="30%p" android:isRepeatable="true"/> - <Key android:codes="9" android:keyIcon="@drawable/sym_bkeyboard_tab" - android:iconPreview="@drawable/sym_keyboard_feedback_tab" - android:keyWidth="10%p"/> - <Key android:keyLabel="." android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - android:keyWidth="15%p" android:keyEdgeFlags="right"/> + <Row + android:keyboardMode="@+id/mode_webentry" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="20%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" + android:keyWidth="20%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_normal_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_url_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="/" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_email_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="\@" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_im_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:popupKeyboard="@xml/popup_smileys" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_webentry_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_symbol_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" + android:keyIcon="@drawable/sym_bkeyboard_mic" + android:iconPreview="@drawable/sym_keyboard_feedback_mic" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:codes="@integer/key_tab" + android:keyIcon="@drawable/sym_bkeyboard_tab" + android:iconPreview="@drawable/sym_keyboard_feedback_tab" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="15%p" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/kbd_symbols.xml b/java/res/xml/kbd_symbols.xml index fad3ebc10..cb8b3b38f 100755..100644 --- a/java/res/xml/kbd_symbols.xml +++ b/java/res/xml/kbd_symbols.xml @@ -18,125 +18,195 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top" > - - <Row> - <Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="¹½⅓¼⅛" - /> - <Key android:codes="50" android:keyLabel="2" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="²⅔" - /> - <Key android:codes="51" android:keyLabel="3" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="³¾⅜" - /> - <Key android:codes="52" android:keyLabel="4" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="⁴" - /> - <Key android:codes="53" android:keyLabel="5" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="⅝" - /> - <Key android:codes="54" android:keyLabel="6"/> - <Key android:codes="55" android:keyLabel="7" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="⅞" - /> - <Key android:codes="56" android:keyLabel="8"/> - <Key android:codes="57" android:keyLabel="9"/> - <Key android:codes="48" android:keyLabel="0" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ⁿ∅" - android:keyEdgeFlags="right"/> + <Key + android:keyLabel="1" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="¹½⅓¼⅛" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="2" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="²⅔" /> + <Key + android:keyLabel="3" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="³¾⅜" /> + <Key + android:keyLabel="4" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="⁴" /> + <Key + android:keyLabel="5" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="⅝" /> + <Key + android:keyLabel="6" /> + <Key + android:keyLabel="7" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="⅞" /> + <Key + android:keyLabel="8" /> + <Key + android:keyLabel="9" /> + <Key + android:keyLabel="0" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="ⁿ∅" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="64" android:keyLabel="\@" android:keyEdgeFlags="left"/> - <Key android:codes="35" android:keyLabel="\#"/> - <Key android:codes="36" android:keyLabel="$" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="¢£€¥₣₤₱" - /> - <Key android:codes="37" android:keyLabel="%" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="‰" - /> - <Key android:codes="38" android:keyLabel="&"/> - <Key android:codes="42" android:keyLabel="*" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="†‡★" - /> - <Key android:codes="45" android:keyLabel="-" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="_–—" - /> - <Key android:keyLabel="+" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="±" - /> - <Key android:codes="40" android:keyLabel="(" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="[{<" - /> - <Key android:codes="41" android:keyLabel=")" android:keyEdgeFlags="right" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="]}>" - /> + <Key + android:keyLabel="\@" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\#" /> + <Key + android:keyLabel="$" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="¢£€¥₣₤₱" /> + <Key + android:keyLabel="%" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="‰" /> + <Key + android:keyLabel="&" /> + <Key + android:keyLabel="*" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="†‡★" /> + <Key + android:keyLabel="-" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="_–—" /> + <Key + android:keyLabel="+" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="±" /> + <Key + android:keyLabel="(" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="[{<" /> + <Key + android:keyLabel=")" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="]}>" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="-1" android:keyLabel="@string/label_alt_key" - android:keyWidth="15%p" android:isModifier="true" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="33" android:keyLabel="!" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="¡" - /> - <Key android:codes="34" android:keyLabel=""" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="“”«»˝" - /> - <Key android:codes="39" android:keyLabel="\'" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="‘’" - /> - <Key android:codes="58" android:keyLabel=":"/> - <Key android:codes="59" android:keyLabel=";"/> - <Key android:codes="47" android:keyLabel="/" /> - <Key android:codes="63" android:keyLabel="\?" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="¿" - /> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" android:isModifier="true"/> + <Key + android:codes="@integer/key_shift" + android:keyLabel="@string/label_alt_key" + android:keyWidth="15%p" + android:isModifier="true" + android:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="!" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="¡" /> + <Key + android:keyLabel=""" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="“”«»˝" /> + <Key + android:keyLabel="\'" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="‘’" /> + <Key + android:keyLabel=":" /> + <Key + android:keyLabel=";" /> + <Key + android:keyLabel="/" /> + <Key + android:keyLabel="\?" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="¿" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" - android:keyWidth="15%p" android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="@integer/key_f1" android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:keyWidth="30%p" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:isRepeatable="true" android:isModifier="true"/> - <Key android:codes="46" android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p" android:isModifier="true"/> - <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 + android:keyboardMode="@+id/mode_symbols" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_alpha_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_symbols_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_alpha_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:codes="@integer/key_f1" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/kbd_symbols_black.xml b/java/res/xml/kbd_symbols_black.xml index 7eae55481..bfb1646f4 100755..100644 --- a/java/res/xml/kbd_symbols_black.xml +++ b/java/res/xml/kbd_symbols_black.xml @@ -18,125 +18,183 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top" > - - <Row> - <Key android:codes="49" android:keyLabel="1" android:keyEdgeFlags="left" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="¹½⅓¼⅛" - /> - <Key android:codes="50" android:keyLabel="2" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="²⅔" - /> - <Key android:codes="51" android:keyLabel="3" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="³¾⅜" - /> - <Key android:codes="52" android:keyLabel="4" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="⁴" - /> - <Key android:codes="53" android:keyLabel="5" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="⅝" - /> - <Key android:codes="54" android:keyLabel="6"/> - <Key android:codes="55" android:keyLabel="7" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="⅞" - /> - <Key android:codes="56" android:keyLabel="8"/> - <Key android:codes="57" android:keyLabel="9"/> - <Key android:codes="48" android:keyLabel="0" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="ⁿ∅" - android:keyEdgeFlags="right"/> + <Key + android:keyLabel="1" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="¹½⅓¼⅛" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="2" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="²⅔" /> + <Key + android:keyLabel="3" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="³¾⅜" /> + <Key + android:keyLabel="4" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="⁴" /> + <Key + android:keyLabel="5" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="⅝" /> + <Key + android:keyLabel="6" /> + <Key + android:keyLabel="7" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="⅞" /> + <Key + android:keyLabel="8" /> + <Key + android:keyLabel="9" /> + <Key + android:keyLabel="0" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="ⁿ∅" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="64" android:keyLabel="\@" android:keyEdgeFlags="left"/> - <Key android:codes="35" android:keyLabel="\#"/> - <Key android:codes="36" android:keyLabel="$" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="¢£€¥₣₤₱" - /> - <Key android:codes="37" android:keyLabel="%" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="‰" - /> - <Key android:codes="38" android:keyLabel="&"/> - <Key android:codes="42" android:keyLabel="*" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="†‡★" - /> - <Key android:codes="45" android:keyLabel="-" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="_–—" - /> - <Key android:keyLabel="+" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="±" - /> - <Key android:codes="40" android:keyLabel="(" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="[{<" - /> - <Key android:codes="41" android:keyLabel=")" android:keyEdgeFlags="right" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="]}>" - /> + <Key + android:keyLabel="\@" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\#" /> + <Key + android:keyLabel="$" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="¢£€¥₣₤₱" /> + <Key + android:keyLabel="%" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="‰" /> + <Key + android:keyLabel="&" /> + <Key + android:keyLabel="*" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="†‡★" /> + <Key + android:keyLabel="-" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="_–—" /> + <Key + android:keyLabel="+" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="±" /> + <Key + android:keyLabel="(" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="[{<" /> + <Key + android:keyLabel=")" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="]}>" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="-1" android:keyLabel="@string/label_alt_key" - android:keyWidth="15%p" android:isModifier="true" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:codes="33" android:keyLabel="!" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="¡" - /> - <Key android:codes="34" android:keyLabel=""" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="“”«»˝" - /> - <Key android:codes="39" android:keyLabel="\'" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="‘’" - /> - <Key android:codes="58" android:keyLabel=":"/> - <Key android:codes="59" android:keyLabel=";"/> - <Key android:codes="47" android:keyLabel="/" /> - <Key android:codes="63" android:keyLabel="\?" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="¿" - /> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <Key + android:codes="@integer/key_shift" + android:keyLabel="@string/label_alt_key" + android:keyWidth="15%p" + android:isModifier="true" + android:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="!" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="¡" /> + <Key + android:keyLabel=""" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="“”«»˝" /> + <Key + android:keyLabel="\'" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="‘’" /> + <Key + android:keyLabel=":" /> + <Key + android:keyLabel=";" /> + <Key + android:keyLabel="/" /> + <Key + android:keyLabel="\?" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="¿" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" - android:keyWidth="15%p" android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:codes="@integer/key_f1" android:keyWidth="10%p"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:keyWidth="30%p" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:isRepeatable="true"/> - <Key android:codes="46" android:keyLabel="." - android:popupKeyboard="@xml/popup_punctuation" - android:keyWidth="10%p"/> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" android:keyWidth="25%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - /> + <Row + android:keyboardMode="@+id/mode_symbols" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_alpha_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_f1" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_symbols_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_alpha_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:codes="@integer/key_f1" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="." + android:popupKeyboard="@xml/popup_punctuation" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/kbd_symbols_shift.xml b/java/res/xml/kbd_symbols_shift.xml index b0693917e..21cbb7132 100755..100644 --- a/java/res/xml/kbd_symbols_shift.xml +++ b/java/res/xml/kbd_symbols_shift.xml @@ -18,91 +18,172 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top" > - - <Row> - <Key android:keyLabel="~" android:keyEdgeFlags="left"/> - <Key android:keyLabel="`"/> - <Key android:keyLabel="|"/> - <Key android:keyLabel="•" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="♪♥♠♦♣" - /> - <Key android:keyLabel="√"/> - <Key android:keyLabel="π" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="Π" - /> - <Key android:keyLabel="÷"/> - <Key android:keyLabel="×"/> - <Key android:keyLabel="{"/> - <Key android:keyLabel="}" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="~" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="`" /> + <Key + android:keyLabel="|" /> + <Key + android:keyLabel="•" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="♪♥♠♦♣" /> + <Key + android:keyLabel="√" /> + <Key + android:keyLabel="π" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="Π" /> + <Key + android:keyLabel="÷" /> + <Key + android:keyLabel="×" /> + <Key + android:keyLabel="{" /> + <Key + android:keyLabel="}" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="9" android:keyLabel="\u21E5" android:keyEdgeFlags="left"/> - <Key android:keyLabel="£"/> - <Key android:keyLabel="¢"/> - <Key android:keyLabel="€"/> - <Key android:keyLabel="°"/> - <Key android:keyLabel="^" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="↑↓←→" - /> - <Key android:keyLabel="_"/> - <Key android:keyLabel="=" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="≠≈∞" - /> - <Key android:keyLabel="["/> - <Key android:keyLabel="]" android:keyEdgeFlags="right"/> + <Key + android:codes="@integer/key_tab" + android:keyLabel="\u21E5" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="£" /> + <Key + android:keyLabel="¢" /> + <Key + android:keyLabel="€" /> + <Key + android:keyLabel="°" /> + <Key + android:keyLabel="^" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="↑↓←→" /> + <Key + android:keyLabel="_" /> + <Key + android:keyLabel="=" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="≠≈∞" /> + <Key + android:keyLabel="[" /> + <Key + android:keyLabel="]" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="-1" android:keyLabel="@string/label_alt_key" - android:keyWidth="15%p" android:isModifier="true" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:keyLabel="™"/> - <Key android:keyLabel="®"/> - <Key android:keyLabel="©"/> - <Key android:keyLabel="¶" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="§" - /> - <Key android:keyLabel="\\"/> - <Key android:keyLabel="<" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="≤«‹" - /> - <Key android:keyLabel=">" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="≥»›" - /> - <Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true" android:isModifier="true"/> + <Key + android:codes="@integer/key_shift" + android:keyLabel="@string/label_alt_key" + android:keyWidth="15%p" + android:isModifier="true" + android:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="™" /> + <Key + android:keyLabel="®" /> + <Key + android:keyLabel="©" /> + <Key + android:keyLabel="¶" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="§" /> + <Key + android:keyLabel="\\" /> + <Key + android:keyLabel="<" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="≤«‹" /> + <Key + android:keyLabel=">" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="≥»›" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_keyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isModifier="true" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p" - android:keyEdgeFlags="left" android:isModifier="true"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_keyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p" android:isModifier="true"/> - <Key android:keyLabel="„" android:keyWidth="10%p" android:isModifier="true"/> - <Key android:codes="32" android:keyIcon="@drawable/sym_keyboard_space" - android:keyWidth="30%p" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:isRepeatable="true" android:isModifier="true"/> - <Key android:keyLabel="…" android:keyWidth="10%p" android:isModifier="true"/> - <Key android: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 + android:keyboardMode="@+id/mode_symbols" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_alpha_key" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="„" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" + android:isModifier="true" /> + <Key + android:keyLabel="…" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_symbols_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_alpha_key" + android:keyWidth="15%p" + android:isModifier="true" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_keyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" + android:isModifier="true" /> + <Key + android:keyLabel="„" + android:isModifier="true" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_keyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" + android:isModifier="true" /> + <Key + android:keyLabel="…" + android:isModifier="true" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_keyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:isModifier="true" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/kbd_symbols_shift_black.xml b/java/res/xml/kbd_symbols_shift_black.xml index 250e0854c..d5d49ce0d 100755..100644 --- a/java/res/xml/kbd_symbols_shift_black.xml +++ b/java/res/xml/kbd_symbols_shift_black.xml @@ -18,91 +18,160 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top" > - - <Row> - <Key android:keyLabel="~" android:keyEdgeFlags="left"/> - <Key android:keyLabel="`"/> - <Key android:keyLabel="|"/> - <Key android:keyLabel="•" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="♪♥♠♦♣" - /> - <Key android:keyLabel="√"/> - <Key android:keyLabel="π" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="Π" - /> - <Key android:keyLabel="÷"/> - <Key android:keyLabel="×"/> - <Key android:keyLabel="{"/> - <Key android:keyLabel="}" android:keyEdgeFlags="right"/> + <Key + android:keyLabel="~" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="`" /> + <Key + android:keyLabel="|" /> + <Key + android:keyLabel="•" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="♪♥♠♦♣" /> + <Key + android:keyLabel="√" /> + <Key + android:keyLabel="π" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="Π" /> + <Key + android:keyLabel="÷" /> + <Key + android:keyLabel="×" /> + <Key + android:keyLabel="{" /> + <Key + android:keyLabel="}" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="9" android:keyLabel="\u21E5" android:keyEdgeFlags="left"/> - <Key android:keyLabel="£"/> - <Key android:keyLabel="¢"/> - <Key android:keyLabel="€"/> - <Key android:keyLabel="°"/> - <Key android:keyLabel="^" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="↑↓←→" - /> - <Key android:keyLabel="_"/> - <Key android:keyLabel="=" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="≠≈∞" - /> - <Key android:keyLabel="["/> - <Key android:keyLabel="]" android:keyEdgeFlags="right"/> + <Key + android:codes="@integer/key_tab" + android:keyLabel="\u21E5" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="£" /> + <Key + android:keyLabel="¢" /> + <Key + android:keyLabel="€" /> + <Key + android:keyLabel="°" /> + <Key + android:keyLabel="^" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="↑↓←→" /> + <Key + android:keyLabel="_" /> + <Key + android:keyLabel="=" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="≠≈∞" /> + <Key + android:keyLabel="[" /> + <Key + android:keyLabel="]" + android:keyEdgeFlags="right" /> </Row> - <Row> - <Key android:codes="-1" android:keyLabel="@string/label_alt_key" - android:keyWidth="15%p" android:isModifier="true" - android:isSticky="true" android:keyEdgeFlags="left"/> - <Key android:keyLabel="™"/> - <Key android:keyLabel="®"/> - <Key android:keyLabel="©"/> - <Key android:keyLabel="¶" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="§" - /> - <Key android:keyLabel="\\"/> - <Key android:keyLabel="<" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="≤«‹" - /> - <Key android:keyLabel=">" - android:popupKeyboard="@xml/kbd_popup_template" - android:popupCharacters="≥»›" - /> - <Key android:codes="-5" android:keyIcon="@drawable/sym_bkeyboard_delete" android:keyWidth="15%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_delete" - android:isRepeatable="true"/> + <Key + android:codes="@integer/key_shift" + android:keyLabel="@string/label_alt_key" + android:keyWidth="15%p" + android:isModifier="true" + android:isSticky="true" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="™" /> + <Key + android:keyLabel="®" /> + <Key + android:keyLabel="©" /> + <Key + android:keyLabel="¶" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="§" /> + <Key + android:keyLabel="\\" /> + <Key + android:keyLabel="<" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="≤«‹" /> + <Key + android:keyLabel=">" + android:popupKeyboard="@xml/kbd_popup_template" + android:popupCharacters="≥»›" /> + <Key + android:codes="@integer/key_delete" + android:keyIcon="@drawable/sym_bkeyboard_delete" + android:iconPreview="@drawable/sym_keyboard_feedback_delete" + android:keyWidth="15%p" + android:isRepeatable="true" + android:keyEdgeFlags="right" /> </Row> - - <Row android:rowEdgeFlags="bottom"> - <Key android:codes="-2" android:keyLabel="@string/label_alpha_key" android:keyWidth="15%p" - android:keyEdgeFlags="left"/> - <Key android:codes="@integer/key_settings" android:keyIcon="@drawable/sym_bkeyboard_settings" - android:iconPreview="@drawable/sym_keyboard_feedback_settings" - android:keyWidth="10%p"/> - <Key android:keyLabel="„" android:keyWidth="10%p" /> - <Key android:codes="32" android:keyIcon="@drawable/sym_bkeyboard_space" - android:keyWidth="30%p" - android:iconPreview="@drawable/sym_keyboard_feedback_space" - android:isRepeatable="true"/> - <Key android:keyLabel="…" android:keyWidth="10%p" /> - <Key android:codes="10" android:keyIcon="@drawable/sym_bkeyboard_return" - android:keyWidth="25%p" android:keyEdgeFlags="right" - android:iconPreview="@drawable/sym_keyboard_feedback_return" - /> + <Row + android:keyboardMode="@+id/mode_symbols" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_alpha_key" + android:keyWidth="20%p" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="„" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="40%p" /> + <Key + android:keyLabel="…" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="20%p" + android:keyEdgeFlags="right" /> + </Row> + <Row + android:keyboardMode="@+id/mode_symbols_with_settings_key" + android:rowEdgeFlags="bottom" + > + <Key + android:codes="@integer/key_symbol" + android:keyLabel="@string/label_alpha_key" + android:keyWidth="15%p" + android:keyEdgeFlags="left" /> + <Key + android:codes="@integer/key_settings" + android:keyIcon="@drawable/sym_bkeyboard_settings" + android:iconPreview="@drawable/sym_keyboard_feedback_settings" /> + <Key + android:keyLabel="„" /> + <Key + android:codes="@integer/key_space" + android:keyIcon="@drawable/sym_bkeyboard_space" + android:iconPreview="@drawable/sym_keyboard_feedback_space" + android:keyWidth="30%p" /> + <Key + android:keyLabel="…" /> + <Key + android:codes="@integer/key_return" + android:keyIcon="@drawable/sym_bkeyboard_return" + android:iconPreview="@drawable/sym_keyboard_feedback_return" + android:keyWidth="25%p" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/popup_domains.xml b/java/res/xml/popup_domains.xml index b733fe24f..0f7d97691 100644 --- a/java/res/xml/popup_domains.xml +++ b/java/res/xml/popup_domains.xml @@ -18,21 +18,29 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="15%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top|bottom" > - - <Row android:rowEdgeFlags="top|bottom"> - <Key android:keyLabel="@string/popular_domain_1" - android:keyOutputText="@string/popular_domain_1" android:keyEdgeFlags="left" /> - <Key android:keyLabel="@string/popular_domain_2" - android:keyOutputText="@string/popular_domain_2"/> - <Key android:keyLabel="@string/popular_domain_3" - android:keyOutputText="@string/popular_domain_3"/> - <Key android:keyLabel="@string/popular_domain_4" - android:keyOutputText="@string/popular_domain_4" android:keyEdgeFlags="right" /> + <Key + android:keyLabel="@string/popular_domain_1" + android:keyOutputText="@string/popular_domain_1" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="@string/popular_domain_2" + android:keyOutputText="@string/popular_domain_2" /> + <Key + android:keyLabel="@string/popular_domain_3" + android:keyOutputText="@string/popular_domain_3" /> + <Key + android:keyLabel="@string/popular_domain_4" + android:keyOutputText="@string/popular_domain_4" + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/popup_punctuation.xml b/java/res/xml/popup_punctuation.xml index a29fb520d..ee1feabec 100644 --- a/java/res/xml/popup_punctuation.xml +++ b/java/res/xml/popup_punctuation.xml @@ -18,29 +18,51 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="10%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top" > - - <Row android:rowEdgeFlags="top"> - <Key android:keyLabel=":" android:keyEdgeFlags="left" /> - <Key android:keyLabel="/" /> - <Key android:keyLabel="&" /> - <Key android:keyLabel="(" /> - <Key android:keyLabel=")" /> - <Key android:keyLabel="-" /> - <Key android:keyLabel="+" android:keyEdgeFlags="right" /> + <Key + android:keyLabel=":" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="/" /> + <Key + android:keyLabel="&" /> + <Key + android:keyLabel="(" /> + <Key + android:keyLabel=")" /> + <Key + android:keyLabel="-" /> + <Key + android:keyLabel="+" + android:keyEdgeFlags="right" /> </Row> - <Row android:rowEdgeFlags="bottom"> - <Key android:keyLabel=";" android:keyEdgeFlags="left" /> - <Key android:keyLabel="," /> - <Key android:keyLabel="\@" /> - <Key android:keyLabel="\'" /> - <Key android:keyLabel=""" /> - <Key android:keyLabel="\?" /> - <Key android:keyLabel="!" android:keyEdgeFlags="right" /> + <Row + android:rowEdgeFlags="bottom" + > + <Key + android:keyLabel=";" + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="\@" /> + <Key + android:keyLabel="\'" /> + <Key + android:keyLabel=""" /> + <Key + android:keyLabel="\?" /> + <Key + android:keyLabel="!" /> + <Key + android:keyLabel="," + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/popup_smileys.xml b/java/res/xml/popup_smileys.xml index 5663fefc8..3b556da77 100644 --- a/java/res/xml/popup_smileys.xml +++ b/java/res/xml/popup_smileys.xml @@ -18,32 +18,72 @@ */ --> -<Keyboard xmlns:android="http://schemas.android.com/apk/res/android" +<Keyboard + xmlns:android="http://schemas.android.com/apk/res/android" android:keyWidth="15%p" android:horizontalGap="0px" android:verticalGap="0px" android:keyHeight="@dimen/key_height" +> + <Row + android:rowEdgeFlags="top" > - - <Row android:rowEdgeFlags="top"> - <Key android:keyLabel=":-)" android:keyOutputText=":-) " android:keyEdgeFlags="left" /> - <Key android:keyLabel=":-(" android:keyOutputText=":-( "/> - <Key android:keyLabel=";-)" android:keyOutputText=";-) "/> - <Key android:keyLabel=":-P" android:keyOutputText=":-P "/> - <Key android:keyLabel="=-O" android:keyOutputText="=-O " android:keyEdgeFlags="right" /> + <Key + android:keyLabel=":-)" + android:keyOutputText=":-) " + android:keyEdgeFlags="left" /> + <Key + android:keyLabel=":-(" + android:keyOutputText=":-( " /> + <Key + android:keyLabel=";-)" + android:keyOutputText=";-) " /> + <Key + android:keyLabel=":-P" + android:keyOutputText=":-P " /> + <Key + android:keyLabel="=-O" + android:keyOutputText="=-O " + android:keyEdgeFlags="right" /> </Row> <Row> - <Key android:keyLabel=":-*" android:keyOutputText=":-* " android:keyEdgeFlags="left" /> - <Key android:keyLabel=":O" android:keyOutputText=":O "/> - <Key android:keyLabel="B-)" android:keyOutputText="B-) "/> - <Key android:keyLabel=":-$" android:keyOutputText=":-$ "/> - <Key android:keyLabel=":-!" android:keyOutputText=":-! " android:keyEdgeFlags="right" /> + <Key + android:keyLabel=":-*" + android:keyOutputText=":-* " + android:keyEdgeFlags="left" /> + <Key + android:keyLabel=":O" + android:keyOutputText=":O " /> + <Key + android:keyLabel="B-)" + android:keyOutputText="B-) " /> + <Key + android:keyLabel=":-$" + android:keyOutputText=":-$ " /> + <Key + android:keyLabel=":-!" + android:keyOutputText=":-! " + android:keyEdgeFlags="right" /> </Row> - <Row android:rowEdgeFlags="bottom"> - <Key android:keyLabel=":-[" android:keyOutputText=":-[ " android:keyEdgeFlags="left" /> - <Key android:keyLabel="O:-)" android:keyOutputText="O:-) "/> - <Key android:keyLabel=":-\\" android:keyOutputText=":-\\ "/> - <Key android:keyLabel=":'(" android:keyOutputText=":'( "/> - <Key android:keyLabel=":-D" android:keyOutputText=":-D " android:keyEdgeFlags="right" /> + <Row + android:rowEdgeFlags="bottom" + > + <Key + android:keyLabel=":-[" + android:keyOutputText=":-[ " + android:keyEdgeFlags="left" /> + <Key + android:keyLabel="O:-)" + android:keyOutputText="O:-) " /> + <Key + android:keyLabel=":-\\" + android:keyOutputText=":-\\ " /> + <Key + android:keyLabel=":'(" + android:keyOutputText=":'( " /> + <Key + android:keyLabel=":-D" + android:keyOutputText=":-D " + android:keyEdgeFlags="right" /> </Row> </Keyboard> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index cd0a12f77..a09e0a2b9 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -60,6 +60,15 @@ /> <ListPreference + android:key="settings_key" + android:title="@string/prefs_settings_key" + android:persistent="true" + android:entryValues="@array/settings_key_modes_values" + android:entries="@array/settings_key_modes" + android:defaultValue="@string/settings_key_mode_auto" + /> + + <ListPreference android:key="voice_mode" android:title="@string/voice_input" android:persistent="true" |
