diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-06-28 16:32:39 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2011-06-29 18:34:57 +0900 |
| commit | d773bf38a3c8f49ea56de67d3b828f8126f46ed2 (patch) | |
| tree | b402a558ecf37cc1ff6f2bc584abf9a537fee5b6 /java/res | |
| parent | 98d2e4c840e7adf9d5fbb008fb3312914b1ed36b (diff) | |
| download | latinime-d773bf38a3c8f49ea56de67d3b828f8126f46ed2.tar.gz latinime-d773bf38a3c8f49ea56de67d3b828f8126f46ed2.tar.xz latinime-d773bf38a3c8f49ea56de67d3b828f8126f46ed2.zip | |
Cleanup key drawing code
This change also modifies 9-patch drawables to fix the following
issues. In order to draw key background drawable just on the
coordinates we want, we have to know where an actual "visible" part is
in the drawable. The only clue we can use is "padding" of the
drawable. To achieve this, the 9-patch drawable must have its
"visible" part marked as "content". Please refer the Bug: 4948171 for
more detailed explanation.
This change also reverts the following "black" drawables back from
Gingerbread because recent change broke these (I70019a91).
* drawable-hdpi/sym_bkeyboard_*.png
* drawable-hdpi/btn_keyboard_key_*_stone.9.png
Bug: 4948171
Change-Id: I6e4d03b3144caa95c793aac97af22df34c5f454f
Diffstat (limited to 'java/res')
81 files changed, 149 insertions, 109 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 50cc49fdb..bc130cab6 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 dabf77ec6..43099899c 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 6e7d74c88..2d1acf22f 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 ddb77c224..af5ea6bd2 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 1e9227e1c..3e25a9817 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 7207b2ece..fc7ba2aeb 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_fulltrans_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png Binary files differindex a524168c9..116329016 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png Binary files differindex 4395e978a..207c90d6c 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.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 9d85c7b74..005c4e498 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_selected.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png Binary files differindex 77e17dbae..9a07acd91 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 a409639e7..be420a7af 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/btn_keyboard_key_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png Binary files differindex 6ec7e6592..3e25180f0 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png Binary files differindex 995780cbf..bad360f77 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png Binary files differindex 1388b6694..cdd6c8b79 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png Binary files differindex 7215782eb..49f519860 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png Binary files differindex 5a94cb6ac..d8421746a 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png Binary files differindex c6373a8af..44c2ad637 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png Binary files differindex 0bd49a0e7..e784eddf8 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png Binary files differindex 634419f1b..a4731cf1a 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png Binary files differindex 8474f9f42..03e163c9c 100644 --- a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png +++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png b/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png Binary files differindex af6082d04..3e4eff698 100644 --- a/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png +++ b/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_delete.png b/java/res/drawable-hdpi/sym_bkeyboard_delete.png Binary files differindex 999a182f4..1d24cc85c 100644 --- a/java/res/drawable-hdpi/sym_bkeyboard_delete.png +++ b/java/res/drawable-hdpi/sym_bkeyboard_delete.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_mic.png b/java/res/drawable-hdpi/sym_bkeyboard_mic.png Binary files differindex 5c73600d9..512f46080 100644 --- a/java/res/drawable-hdpi/sym_bkeyboard_mic.png +++ b/java/res/drawable-hdpi/sym_bkeyboard_mic.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_return.png b/java/res/drawable-hdpi/sym_bkeyboard_return.png Binary files differindex 91bb397ff..426e1599e 100644 --- a/java/res/drawable-hdpi/sym_bkeyboard_return.png +++ b/java/res/drawable-hdpi/sym_bkeyboard_return.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_search.png b/java/res/drawable-hdpi/sym_bkeyboard_search.png Binary files differindex 0ac08145b..1b6f884fa 100644 --- a/java/res/drawable-hdpi/sym_bkeyboard_search.png +++ b/java/res/drawable-hdpi/sym_bkeyboard_search.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_settings.png b/java/res/drawable-hdpi/sym_bkeyboard_settings.png Binary files differindex 5b6217aa0..08ba18f28 100644 --- a/java/res/drawable-hdpi/sym_bkeyboard_settings.png +++ b/java/res/drawable-hdpi/sym_bkeyboard_settings.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_shift.png b/java/res/drawable-hdpi/sym_bkeyboard_shift.png Binary files differindex 5ef01b8bd..5a22dd309 100644 --- a/java/res/drawable-hdpi/sym_bkeyboard_shift.png +++ b/java/res/drawable-hdpi/sym_bkeyboard_shift.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png b/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png Binary files differindex 7d36dcb34..566449126 100644 --- a/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png +++ b/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_space.png b/java/res/drawable-hdpi/sym_bkeyboard_space.png Binary files differindex 77518cc93..cd0ebe2f4 100644 --- a/java/res/drawable-hdpi/sym_bkeyboard_space.png +++ b/java/res/drawable-hdpi/sym_bkeyboard_space.png diff --git a/java/res/drawable-hdpi/sym_bkeyboard_tab.png b/java/res/drawable-hdpi/sym_bkeyboard_tab.png Binary files differindex 5db4cef2b..3466e1271 100644 --- a/java/res/drawable-hdpi/sym_bkeyboard_tab.png +++ b/java/res/drawable-hdpi/sym_bkeyboard_tab.png 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 4e337fa08..49329f094 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 fe18497d8..46e9db092 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 00aab3d5a..ee60e4864 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 ac0bfd3c1..c6876f76e 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 ea2f35789..1f8f318d1 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 6195ac0d4..2bb7b64f4 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_fulltrans_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png Binary files differindex 20f3d5087..4b1a78cfb 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png Binary files differindex 1ed3065c5..697683e29 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_fulltrans_pressed.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 50cd06ae3..f5ce40cf6 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_selected.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png Binary files differindex 125ff1335..ca73b9249 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 7ce52f0f5..73f2006d4 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/btn_keyboard_key_normal.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png Binary files differindex 7ba18dd25..12bc97928 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_normal.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png Binary files differindex bda9b8394..44bd414a1 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_off.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png Binary files differindex fad0ec458..cdd6c8b79 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_off_stone.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png Binary files differindex 0c16ed509..43fdf5b88 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_on.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png Binary files differindex 215f8157c..d8421746a 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_on_stone.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png Binary files differindex 88acdd748..44c2ad637 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_normal_stone.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png Binary files differindex 39b9314a1..1c1f3d711 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_pressed.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png Binary files differindex bdcf06e1b..dacb675a9 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_pressed_off.9.png diff --git a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png Binary files differindex 79621a9e6..3daa69f31 100644 --- a/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png +++ b/java/res/drawable-mdpi/btn_keyboard_key_pressed_on.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal.9.png Binary files differindex eae1e3a54..d0090a305 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off.9.png Binary files differindex 13bad8f1a..2baf7d90c 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on.9.png Binary files differindex 853b8bc6e..6812f9e8f 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed.9.png Binary files differindex 1edfd64fe..a932249a8 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off.9.png Binary files differindex dfdbfadd3..16416f000 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on.9.png Binary files differindex 0e2733e17..3ca93fdb3 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png Binary files differindex 00c447604..df3b5ba2d 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_light_normal.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_light_normal.9.png Binary files differindex ea13a7fdf..aa4f44fdd 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_light_normal.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_light_normal.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png Binary files differindex 057c5716e..4539255c2 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed.9.png Binary files differindex 5d8e46de0..568392444 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png Binary files differindex f53b40419..026005d6f 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png Binary files differindex 3c6ae6be8..38c5f244b 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_stone.9.png Binary files differindex eebe7d391..dec219304 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_stone.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_stone.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png Binary files differindex 655bfb2c6..f1223e50e 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_stone.9.png Binary files differindex 336248aae..3c77b3ccd 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_stone.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_stone.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_stone.9.png Binary files differindex bb1c72bb3..099472889 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_normal_stone.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_stone.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png Binary files differindex f73911674..ec35db54d 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png Binary files differindex 34a948f4e..bd30464d6 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png Binary files differindex 520f12d3f..a3ff5d1bb 100644 --- a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png +++ b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png diff --git a/java/res/drawable/btn_keyboard_key_fulltrans.xml b/java/res/drawable/btn_keyboard_key_fulltrans.xml deleted file mode 100644 index bad2a931d..000000000 --- a/java/res/drawable/btn_keyboard_key_fulltrans.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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"> - - <!-- Normal keys --> - - <item android:state_pressed="true" - android:drawable="@drawable/btn_keyboard_key_fulltrans_pressed" /> - <item - android:drawable="@drawable/btn_keyboard_key_fulltrans_normal" /> - -</selector> diff --git a/java/res/drawable/btn_keyboard_key_popup.xml b/java/res/drawable/btn_keyboard_key_popup.xml index 860cfd5d5..9e3670d22 100644 --- a/java/res/drawable/btn_keyboard_key_popup.xml +++ b/java/res/drawable/btn_keyboard_key_popup.xml @@ -17,5 +17,5 @@ <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" /> + <item android:drawable="@drawable/transparent" /> </selector> diff --git a/java/res/drawable/btn_keyboard_key_popup_ics.xml b/java/res/drawable/btn_keyboard_key_popup_ics.xml index 8f797ac3c..b99679ba1 100644 --- a/java/res/drawable/btn_keyboard_key_popup_ics.xml +++ b/java/res/drawable/btn_keyboard_key_popup_ics.xml @@ -17,5 +17,5 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true" android:drawable="@drawable/btn_keyboard_key_popup_selected_holo" /> - <item android:drawable="@drawable/btn_keyboard_key_popup_background_holo" /> + <item android:drawable="@drawable/transparent" /> </selector> diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index d6e096278..d5ca25063 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -24,24 +24,33 @@ <fraction name="minKeyboardHeight">45%p</fraction> <!-- key_height + key_bottom_gap = popup_key_height --> <!-- <dimen name="key_height">0.260in</dimen>--> - <dimen name="key_bottom_gap">0.020in</dimen> <dimen name="popup_key_height">0.280in</dimen> - <dimen name="keyboard_top_padding">0.00in</dimen> + <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen> + + <dimen name="keyboard_top_padding">0.02in</dimen> <dimen name="keyboard_bottom_padding">0.00in</dimen> - <dimen name="key_bottom_gap_ics">0.04in</dimen> - <dimen name="key_horizontal_gap_ics">0.01in</dimen> + <dimen name="key_bottom_gap">1.21mm</dimen> + <dimen name="key_horizontal_gap">0.35mm</dimen> + + <dimen name="key_bottom_gap_stone">1.40mm</dimen> + <dimen name="key_horizontal_gap_stone">1.00mm</dimen> + + <dimen name="key_bottom_gap_gb">1.66mm</dimen> + <dimen name="key_horizontal_gap_gb">0.86mm</dimen> + <dimen name="keyboard_top_padding_ics">0.03in</dimen> <dimen name="keyboard_bottom_padding_ics">0.00in</dimen> - <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen> + <dimen name="key_bottom_gap_ics">1.79mm</dimen> + <dimen name="key_horizontal_gap_ics">0.88mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">8dip</dimen> + <dimen name="key_label_horizontal_padding">8dip</dimen> - <fraction name="key_letter_ratio">55%</fraction> - <fraction name="key_large_letter_ratio">68%</fraction> - <fraction name="key_label_ratio">35%</fraction> - <fraction name="key_hint_letter_ratio">28%</fraction> - <fraction name="key_hint_label_ratio">45%</fraction> + <fraction name="key_letter_ratio">65%</fraction> + <fraction name="key_large_letter_ratio">74%</fraction> + <fraction name="key_label_ratio">40%</fraction> + <fraction name="key_hint_letter_ratio">30%</fraction> + <fraction name="key_hint_label_ratio">52%</fraction> <fraction name="key_uppercase_letter_ratio">40%</fraction> <fraction name="key_preview_text_ratio">90%</fraction> <dimen name="key_preview_offset">0.08in</dimen> diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index 5d1fbc748..5016f4247 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -22,20 +22,28 @@ <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 --> <dimen name="keyboardHeight">45.0mm</dimen> <fraction name="minKeyboardHeight">45%p</fraction> - <!-- key_height + key_bottom_gap = popup_key_height --> - <!-- <dimen name="key_height">14.5mm</dimen> --> - <dimen name="key_bottom_gap">1.3mm</dimen> - <dimen name="key_horizontal_gap">1.3mm</dimen> + + <dimen name="keyboard_horizontal_edges_padding">0dp</dimen> <dimen name="keyboard_top_padding">1.1mm</dimen> <dimen name="keyboard_bottom_padding">0.0mm</dimen> - <dimen name="key_bottom_gap_ics">1.3mm</dimen> - <dimen name="key_horizontal_gap_ics">1.3mm</dimen> + <dimen name="key_bottom_gap">2.21mm</dimen> + <dimen name="key_horizontal_gap">1.97mm</dimen> + + <dimen name="key_bottom_gap_stone">1.96mm</dimen> + <dimen name="key_horizontal_gap_stone">2.31mm</dimen> + + <dimen name="key_bottom_gap_gb">2.34mm</dimen> + <dimen name="key_horizontal_gap_gb">2.22mm</dimen> + + <dimen name="key_bottom_gap_ics">1.66mm</dimen> + <dimen name="key_horizontal_gap_ics">1.66mm</dimen> <dimen name="keyboard_top_padding_ics">1.1mm</dimen> <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen> + <dimen name="popup_key_height">13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">18dip</dimen> + <dimen name="key_label_horizontal_padding">18dip</dimen> <fraction name="key_letter_ratio">45%</fraction> <fraction name="key_large_letter_ratio">45%</fraction> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 675f40c2e..1a82b0c6c 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -23,18 +23,27 @@ <dimen name="keyboardHeight">48.0mm</dimen> <fraction name="maxKeyboardHeight">50%p</fraction> <fraction name="minKeyboardHeight">-35.0%p</fraction> - <!-- key_height + key_bottom_gap = popup_key_height --> - <!-- <dimen name="key_height">14.5mm</dimen> --> - <dimen name="key_bottom_gap">1.0mm</dimen> - <dimen name="key_horizontal_gap">1.0mm</dimen> + <dimen name="popup_key_height">10.0mm</dimen> + + <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen> <dimen name="keyboard_top_padding">1.1mm</dimen> <dimen name="keyboard_bottom_padding">0.0mm</dimen> - <dimen name="key_bottom_gap_ics">1.0mm</dimen> - <dimen name="key_horizontal_gap_ics">1.0mm</dimen> + <dimen name="key_bottom_gap">1.80mm</dimen> + <dimen name="key_horizontal_gap">1.67mm</dimen> + + <dimen name="key_bottom_gap_stone">1.80mm</dimen> + <dimen name="key_horizontal_gap_stone">1.44mm</dimen> + + <dimen name="key_bottom_gap_gb">2.22mm</dimen> + <dimen name="key_horizontal_gap_gb">1.90mm</dimen> + + <dimen name="key_bottom_gap_ics">1.37mm</dimen> + <dimen name="key_horizontal_gap_ics">1.53mm</dimen> <dimen name="keyboard_top_padding_ics">1.1mm</dimen> <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen> - <dimen name="mini_keyboard_key_horizontal_padding">12dip</dimen> + + <dimen name="mini_keyboard_key_horizontal_padding">6dip</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> <dimen name="mini_keyboard_slide_allowance">15.6mm</dimen> @@ -42,7 +51,9 @@ <dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">6dip</dimen> + <dimen name="key_label_horizontal_padding">6dip</dimen> + <dimen name="key_hint_letter_padding">3dp</dimen> + <dimen name="key_uppercase_letter_padding">3dp</dimen> <fraction name="key_letter_ratio">37%</fraction> <fraction name="key_large_letter_ratio">37%</fraction> diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml index 2201ce8a3..8cbd37e17 100644 --- a/java/res/values-sw768dp-land/dimens.xml +++ b/java/res/values-sw768dp-land/dimens.xml @@ -22,27 +22,35 @@ <!-- keyboardHeight = key_height*4 + key_bottom_gap*3, key_height=14.5mm --> <dimen name="keyboardHeight">58.0mm</dimen> <fraction name="minKeyboardHeight">45%p</fraction> - <!-- key_height + key_bottom_gap = popup_key_height --> - <!-- <dimen name="key_height">14.5mm</dimen> --> - <dimen name="key_bottom_gap">1.6mm</dimen> - <dimen name="key_horizontal_gap">1.6mm</dimen> + + <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen> <dimen name="keyboard_top_padding">1.1mm</dimen> <dimen name="keyboard_bottom_padding">0.0mm</dimen> - <dimen name="key_bottom_gap_ics">1.6mm</dimen> - <dimen name="key_horizontal_gap_ics">1.6mm</dimen> + + <dimen name="key_bottom_gap">2.65mm</dimen> + <dimen name="key_horizontal_gap">2.34mm</dimen> + + <dimen name="key_bottom_gap_stone">1.96mm</dimen> + <dimen name="key_horizontal_gap_stone">2.31mm</dimen> + + <dimen name="key_bottom_gap_gb">2.80mm</dimen> + <dimen name="key_horizontal_gap_gb">2.60mm</dimen> + + <dimen name="key_bottom_gap_ics">2.25mm</dimen> + <dimen name="key_horizontal_gap_ics">2.22mm</dimen> <dimen name="keyboard_top_padding_ics">1.1mm</dimen> <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen> + <dimen name="popup_key_height">13.0mm</dimen> - <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">18dip</dimen> + <dimen name="key_label_horizontal_padding">18dip</dimen> - <fraction name="key_letter_ratio">38%</fraction> - <fraction name="key_large_letter_ratio">38%</fraction> - <fraction name="key_label_ratio">26%</fraction> + <fraction name="key_letter_ratio">43%</fraction> + <fraction name="key_large_letter_ratio">42%</fraction> + <fraction name="key_label_ratio">28%</fraction> <fraction name="key_hint_letter_ratio">23%</fraction> - <fraction name="key_hint_label_ratio">26%</fraction> + <fraction name="key_hint_label_ratio">28%</fraction> <fraction name="key_uppercase_letter_ratio">24%</fraction> <dimen name="key_preview_height">17.0mm</dimen> diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index 2e41db52a..81a68e233 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -23,19 +23,27 @@ <dimen name="keyboardHeight">48.0mm</dimen> <fraction name="maxKeyboardHeight">50%p</fraction> <fraction name="minKeyboardHeight">-35.0%p</fraction> - <!-- key_height + key_bottom_gap = popup_key_height --> - <!-- <dimen name="key_height">14.5mm</dimen> --> - <dimen name="key_bottom_gap">1.1mm</dimen> - <dimen name="key_horizontal_gap">1.1mm</dimen> + + <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen> <dimen name="keyboard_top_padding">1.1mm</dimen> <dimen name="keyboard_bottom_padding">0.0mm</dimen> - <dimen name="key_bottom_gap_ics">1.1mm</dimen> - <dimen name="key_horizontal_gap_ics">1.1mm</dimen> + + <dimen name="key_bottom_gap">2.05mm</dimen> + <dimen name="key_horizontal_gap">2.11mm</dimen> + + <dimen name="key_bottom_gap_stone">1.80mm</dimen> + <dimen name="key_horizontal_gap_stone">1.44mm</dimen> + + <dimen name="key_bottom_gap_gb">2.25mm</dimen> + <dimen name="key_horizontal_gap_gb">1.96mm</dimen> + + <dimen name="key_bottom_gap_ics">1.75mm</dimen> + <dimen name="key_horizontal_gap_ics">1.79mm</dimen> <dimen name="keyboard_top_padding_ics">1.1mm</dimen> <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen> + <dimen name="popup_key_height">10.0mm</dimen> - <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen> - <dimen name="mini_keyboard_horizontal_padding_ics">40dip</dimen> + <dimen name="mini_keyboard_key_horizontal_padding">12dip</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> @@ -44,14 +52,16 @@ <dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">6dip</dimen> + <dimen name="key_label_horizontal_padding">6dip</dimen> + <dimen name="key_hint_letter_padding">3dp</dimen> + <dimen name="key_uppercase_letter_padding">3dp</dimen> - <fraction name="key_letter_ratio">38%</fraction> - <fraction name="key_large_letter_ratio">38%</fraction> - <fraction name="key_label_ratio">26%</fraction> + <fraction name="key_letter_ratio">40%</fraction> + <fraction name="key_large_letter_ratio">42%</fraction> + <fraction name="key_label_ratio">28%</fraction> <fraction name="key_hint_letter_ratio">23%</fraction> - <fraction name="key_hint_label_ratio">26%</fraction> - <fraction name="key_uppercase_letter_ratio">25%</fraction> + <fraction name="key_hint_label_ratio">28%</fraction> + <fraction name="key_uppercase_letter_ratio">26%</fraction> <fraction name="key_preview_text_ratio">50%</fraction> <dimen name="key_preview_height">15.0mm</dimen> <dimen name="key_preview_offset">0.1in</dimen> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 4470d7b4e..c5897c853 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -51,6 +51,12 @@ <attr name="keyHintLabelRatio" format="float" /> <!-- Size of the text for upper case letter, in the proportion of key height. --> <attr name="keyUppercaseLetterRatio" format="float" /> + <!-- Horizontal padding of left/right aligned key label to the edge of the key. --> + <attr name="keyLabelHorizontalPadding" format="dimension" /> + <!-- Top and right padding of hint letter to the edge of the key.--> + <attr name="keyHintLetterPadding" format="dimension" /> + <!-- Top and right padding of upper case letter to the edge of the key.--> + <attr name="keyUppercaseLetterPadding" format="dimension" /> <!-- Color to use for the label in a key. --> <attr name="keyTextColor" format="color" /> @@ -199,7 +205,6 @@ <!-- This should be aligned with Key.LABEL_OPTION_* --> <flag name="alignLeft" value="0x01" /> <flag name="alignRight" value="0x02" /> - <flag name="alignBottom" value="0x04" /> <flag name="alignLeftOfCenter" value="0x08" /> <flag name="largeLetter" value="0x10" /> <flag name="fontNormal" value="0x20" /> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index c1ef86930..36074b3b8 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -19,26 +19,33 @@ --> <resources> - <!-- keyboardHeight = key_height*4 + key_bottom_gap*3, key_height=0.295in --> + <!-- keyboardHeight = row_height*4 + key_bottom_gap*3 --> <dimen name="keyboardHeight">1.285in</dimen> <fraction name="maxKeyboardHeight">50%p</fraction> <fraction name="minKeyboardHeight">-61.8%p</fraction> - <!-- key_height + key_bottom_gap = popup_key_height --> - <!-- <dimen name="key_height">0.295in</dimen> --> - <dimen name="key_bottom_gap">0.035in</dimen> - <dimen name="key_horizontal_gap">0.000in</dimen> + <dimen name="popup_key_height">0.330in</dimen> - <dimen name="keyboard_top_padding">0.00in</dimen> - <dimen name="keyboard_bottom_padding">0.06in</dimen> - <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen> - <dimen name="mini_keyboard_horizontal_padding">16dip</dimen> + + <dimen name="mini_keyboard_horizontal_edges_padding">16dip</dimen> <dimen name="mini_keyboard_key_horizontal_padding">8dip</dimen> - <dimen name="key_bottom_gap_ics">0.06in</dimen> - <dimen name="key_horizontal_gap_ics">0.01in</dimen> + <dimen name="keyboard_horizontal_edges_padding">0dp</dimen> + <dimen name="keyboard_top_padding">0.02in</dimen> + <dimen name="keyboard_bottom_padding">0.06in</dimen> + <dimen name="key_bottom_gap">2.04mm</dimen> + <dimen name="key_horizontal_gap">0.70mm</dimen> + + <dimen name="key_bottom_gap_stone">2.45mm</dimen> + <dimen name="key_horizontal_gap_stone">0.90mm</dimen> + + <dimen name="key_bottom_gap_gb">2.12mm</dimen> + <dimen name="key_horizontal_gap_gb">1.02mm</dimen> + <dimen name="keyboard_top_padding_ics">0.03in</dimen> <dimen name="keyboard_bottom_padding_ics">0.06in</dimen> - <dimen name="mini_keyboard_horizontal_padding_ics">38dip</dimen> + <dimen name="mini_keyboard_horizontal_edges_padding_ics">6dp</dimen> + <dimen name="key_bottom_gap_ics">2.37mm</dimen> + <dimen name="key_horizontal_gap_ics">0.90mm</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> @@ -49,19 +56,20 @@ to user's finger. --> <dimen name="keyboard_vertical_correction">-0.05in</dimen> - <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">4dip</dimen> - - <fraction name="key_letter_ratio">45%</fraction> - <fraction name="key_large_letter_ratio">55%</fraction> - <fraction name="key_label_ratio">29%</fraction> - <fraction name="key_hint_letter_ratio">23%</fraction> - <fraction name="key_hint_label_ratio">36%</fraction> + <fraction name="key_letter_ratio">55%</fraction> + <fraction name="key_large_letter_ratio">65%</fraction> + <fraction name="key_label_ratio">34%</fraction> + <fraction name="key_hint_letter_ratio">25%</fraction> + <fraction name="key_hint_label_ratio">44%</fraction> <fraction name="key_uppercase_letter_ratio">35%</fraction> <fraction name="key_preview_text_ratio">82%</fraction> <dimen name="key_preview_height">80sp</dimen> <dimen name="key_preview_offset">0.1in</dimen> + <dimen name="key_label_horizontal_padding">4dip</dimen> + <dimen name="key_hint_letter_padding">2dp</dimen> + <dimen name="key_uppercase_letter_padding">2dp</dimen> + <dimen name="key_preview_height_ics">80sp</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 08301be5c..29b9d589c 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -49,6 +49,9 @@ <item name="keyHintLabelColor">#E0E0E4E5</item> <item name="keyUppercaseLetterInactivatedColor">#66E0E4E5</item> <item name="keyUppercaseLetterActivatedColor">#CCE0E4E5</item> + <item name="keyLabelHorizontalPadding">@dimen/key_label_horizontal_padding</item> + <item name="keyHintLetterPadding">@dimen/key_hint_letter_padding</item> + <item name="keyUppercaseLetterPadding">@dimen/key_uppercase_letter_padding</item> <item name="keyPreviewLayout">@layout/key_preview</item> <item name="keyPreviewBackground">@drawable/keyboard_key_feedback</item> <item name="keyPreviewLeftBackground">@null</item> @@ -72,8 +75,8 @@ </style> <style name="PopupMiniKeyboardPanelStyle"> <item name="android:background">@drawable/keyboard_popup_panel_background</item> - <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_padding</item> - <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_padding</item> + <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding</item> + <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding</item> </style> <style name="SuggestionsStripBackgroundStyle"> <item name="android:background">@drawable/keyboard_suggest_strip</item> @@ -99,8 +102,8 @@ </style> <!-- Theme "Stone" --> <style name="Keyboard.Stone" parent="Keyboard"> - <item name="horizontalGap">@dimen/key_horizontal_gap</item> - <item name="verticalGap">@dimen/key_bottom_gap</item> + <item name="horizontalGap">@dimen/key_horizontal_gap_stone</item> + <item name="verticalGap">@dimen/key_bottom_gap_stone</item> </style> <style name="LatinKeyboard.Stone" parent="LatinKeyboard"> <item name="spacebarTextColor">#FF000000</item> @@ -126,6 +129,10 @@ <item name="keyTextStyle">bold</item> </style> <!-- Theme "Gingerbread" --> + <style name="Keyboard.Gingerbread" parent="Keyboard"> + <item name="horizontalGap">@dimen/key_horizontal_gap_gb</item> + <item name="verticalGap">@dimen/key_bottom_gap_gb</item> + </style> <style name="KeyboardView.Gingerbread" parent="KeyboardView"> <item name="android:background">@drawable/keyboard_dark_background</item> <item name="keyBackground">@drawable/btn_keyboard_key_gingerbread</item> @@ -168,9 +175,9 @@ <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item> </style> <style name="PopupMiniKeyboardPanelStyle.IceCreamSandwich"> - <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item> - <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_padding_ics</item> - <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_padding_ics</item> + <item name="android:background">@drawable/btn_keyboard_key_popup_background_holo</item> + <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding_ics</item> + <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding_ics</item> </style> <style name="SuggestionsStripBackgroundStyle.IceCreamSandwich"> <item name="android:background">@drawable/keyboard_suggest_strip_holo</item> diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml index 091baa737..60f226153 100644 --- a/java/res/values/themes-gingerbread.xml +++ b/java/res/values/themes-gingerbread.xml @@ -16,7 +16,7 @@ <resources> <style name="KeyboardTheme.Gingerbread" parent="KeyboardIcons"> - <item name="keyboardStyle">@style/Keyboard</item> + <item name="keyboardStyle">@style/Keyboard.Gingerbread</item> <item name="latinKeyboardStyle">@style/LatinKeyboard</item> <item name="keyboardViewStyle">@style/KeyboardView.Gingerbread</item> <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.Gingerbread</item> |
