diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num0.png b/java/res/drawable-hdpi/sym_bkeyboard_num0.png
deleted file mode 100644
index 02f2811665011fa820ce2dd9be53a0d25fff36f6..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num0.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num1.png b/java/res/drawable-hdpi/sym_bkeyboard_num1.png
deleted file mode 100644
index 304acfd31cc4572edb9026b5ef64365ccc6a6ed7..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num1.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num2.png b/java/res/drawable-hdpi/sym_bkeyboard_num2.png
deleted file mode 100644
index 295eba1e42a6bb7874b2878fa4f1015f72d07156..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num2.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num3.png b/java/res/drawable-hdpi/sym_bkeyboard_num3.png
deleted file mode 100644
index 9ee6e4437e572f1fa6fd2de0454f6c79ab85600c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num3.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num4.png b/java/res/drawable-hdpi/sym_bkeyboard_num4.png
deleted file mode 100644
index ab4392dcb637af3251e155d2a215dc5d6a2bfdd8..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num4.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num5.png b/java/res/drawable-hdpi/sym_bkeyboard_num5.png
deleted file mode 100644
index 004ecd72ed9b2b86a55b8c22ae7f11586da59117..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num5.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num6.png b/java/res/drawable-hdpi/sym_bkeyboard_num6.png
deleted file mode 100644
index 2aa317d77bad7f6c7792197a02291a8c89d54aa6..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num6.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num7.png b/java/res/drawable-hdpi/sym_bkeyboard_num7.png
deleted file mode 100644
index 721361c290277bea0e7d86c3645c0a495f272d82..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num7.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num8.png b/java/res/drawable-hdpi/sym_bkeyboard_num8.png
deleted file mode 100644
index 941359f6b72e39c50054a1d7fbd9186ade90b882..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num8.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num9.png b/java/res/drawable-hdpi/sym_bkeyboard_num9.png
deleted file mode 100644
index 74e08a087063c9d4e9610c45ca3042bc26b017d7..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_123_mic_holo.png b/java/res/drawable-hdpi/sym_keyboard_123_mic_holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f0aec24c854e3a2fae350ae7b980d0d7218bff5
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_123_mic_holo.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_delete_holo.png b/java/res/drawable-hdpi/sym_keyboard_delete_holo.png
index 9d87ba6192a83891b1e3da2403eb47b2faebf795..0591b82cdda5cad9d2f36874d9046ea451cabf43 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_delete_holo.png and b/java/res/drawable-hdpi/sym_keyboard_delete_holo.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num0.png b/java/res/drawable-hdpi/sym_keyboard_num0.png
deleted file mode 100644
index 2024f416b8378b942b3c23c985ee62161f40d3b7..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num0.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num0_holo.png b/java/res/drawable-hdpi/sym_keyboard_num0_holo.png
deleted file mode 100644
index fbd55d68dee257555aff2e214590e070c614c2e3..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num0_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num1.png b/java/res/drawable-hdpi/sym_keyboard_num1.png
deleted file mode 100644
index 5e66b9a31bec56eab9f775e83702efd3c377e5a5..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num1.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num1_holo.png b/java/res/drawable-hdpi/sym_keyboard_num1_holo.png
deleted file mode 100644
index e651c3e854050702985f1e3f132418fb0a4ed9f0..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num1_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num2.png b/java/res/drawable-hdpi/sym_keyboard_num2.png
deleted file mode 100644
index 3933270dc192205c230c8eeaabb366bbc04a7209..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num2.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num2_holo.png b/java/res/drawable-hdpi/sym_keyboard_num2_holo.png
deleted file mode 100644
index 8458f531394c196bc74f5942e78febdb6941d305..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num2_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num3.png b/java/res/drawable-hdpi/sym_keyboard_num3.png
deleted file mode 100644
index c69548345de2702553cbe0673cbf9e706955b97d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num3.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num3_holo.png b/java/res/drawable-hdpi/sym_keyboard_num3_holo.png
deleted file mode 100644
index 81025c635a23bd1cb95e3a9db70f95f8b2c5b749..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num3_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num4.png b/java/res/drawable-hdpi/sym_keyboard_num4.png
deleted file mode 100644
index ef20add54786ad7fa1ff4d7b06bede210db51e80..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num4.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num4_holo.png b/java/res/drawable-hdpi/sym_keyboard_num4_holo.png
deleted file mode 100644
index 30a0c77c76d26de8b2331b1710044c2673c69e86..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num4_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num5.png b/java/res/drawable-hdpi/sym_keyboard_num5.png
deleted file mode 100644
index 9a2f51f8d3ee194a4103ba4796b7ae9d854f6a66..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num5.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num5_holo.png b/java/res/drawable-hdpi/sym_keyboard_num5_holo.png
deleted file mode 100644
index 147f056fc98a930b16b1a35daa3507ebe858b821..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num5_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num6.png b/java/res/drawable-hdpi/sym_keyboard_num6.png
deleted file mode 100644
index 6829f81d1b20ab3e66633981bd6580f3bc076dc4..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num6.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num6_holo.png b/java/res/drawable-hdpi/sym_keyboard_num6_holo.png
deleted file mode 100644
index b9683084431a66a8cff383c03d16120d1ffce7f3..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num6_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num7.png b/java/res/drawable-hdpi/sym_keyboard_num7.png
deleted file mode 100644
index dc608d4e10ddba6495bffc0650edcf9d0b35a112..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num7.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num7_holo.png b/java/res/drawable-hdpi/sym_keyboard_num7_holo.png
deleted file mode 100644
index 7d44bfb4518bfa576a699cd755e6097279e0bfd5..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num7_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num8.png b/java/res/drawable-hdpi/sym_keyboard_num8.png
deleted file mode 100644
index f0978c6117baf8e8b4dcc3ccbf772ebef1432999..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num8.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num8_holo.png b/java/res/drawable-hdpi/sym_keyboard_num8_holo.png
deleted file mode 100644
index 093cd743a5a8653df15588d039b1678b3b9fa342..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num8_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num9.png b/java/res/drawable-hdpi/sym_keyboard_num9.png
deleted file mode 100644
index 4b8328d1fd4107179a07edcc85e7d4599bee6ffa..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num9_holo.png b/java/res/drawable-hdpi/sym_keyboard_num9_holo.png
deleted file mode 100644
index f35e80dabbc6967c0148a21477b19de727ddc791..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_num9_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_return_holo.png b/java/res/drawable-hdpi/sym_keyboard_return_holo.png
index ef04d67676d35a58af851a015039cb1fc1966e4d..9743c7f2f7fea2e5351c657a6ac020d461bea045 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_return_holo.png and b/java/res/drawable-hdpi/sym_keyboard_return_holo.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings_holo.png b/java/res/drawable-hdpi/sym_keyboard_settings_holo.png
index 29085e5ea2d8dca14a2fc7bcb6ff1f463ef0b95a..1e5bf939e397c21e7b089973df85b82e04a06f51 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_settings_holo.png and b/java/res/drawable-hdpi/sym_keyboard_settings_holo.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_holo.png b/java/res/drawable-hdpi/sym_keyboard_shift_holo.png
index 1e074a716ff3bc2503c0bc6c9706ab5bb846d240..8e3d0320cc223e1f74f8f6445d2d6e8135e91218 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_holo.png and b/java/res/drawable-hdpi/sym_keyboard_shift_holo.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png
index ab77b9542b6b0914db1c712d9c2316332a5df5dc..d345634a6dd0b2dfe5919961f4b8e79e98712342 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png and b/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space_holo.png b/java/res/drawable-hdpi/sym_keyboard_space_holo.png
index 143a8996474b4de6b39049797e15c024c9c9822a..780733ec58671ef73cffb71360e9c9f11156034b 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_space_holo.png and b/java/res/drawable-hdpi/sym_keyboard_space_holo.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_tab_holo.png b/java/res/drawable-hdpi/sym_keyboard_tab_holo.png
index 321c541ccd3af52c59f1dd8d93b337f25c7ff9c3..3d1c5c0ea8b886e01337963ce511f57c574ed753 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_tab_holo.png and b/java/res/drawable-hdpi/sym_keyboard_tab_holo.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_holo.png b/java/res/drawable-hdpi/sym_keyboard_voice_holo.png
index d3cb46e0d8f53c0f4a4d35b851500f5cfaa16509..520a40f09b684ef6bdb2b761e8a5bf8d913e4289 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_voice_holo.png and b/java/res/drawable-hdpi/sym_keyboard_voice_holo.png differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_num0.png b/java/res/drawable-mdpi/sym_bkeyboard_num0.png
deleted file mode 100644
index 7188f9ca54ce6fe689b4a23006ba736ae38eb8a0..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_num0.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_num1.png b/java/res/drawable-mdpi/sym_bkeyboard_num1.png
deleted file mode 100644
index 2a31bd458f27f323a2d125b16d1dac901da7ecd7..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_num1.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_num2.png b/java/res/drawable-mdpi/sym_bkeyboard_num2.png
deleted file mode 100644
index c1e9cc9b137f9f2cc255503e270b659482c90595..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_num2.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_num3.png b/java/res/drawable-mdpi/sym_bkeyboard_num3.png
deleted file mode 100644
index e9987668cc7eb1776775e1da6611be282b2e9e26..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_num3.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_num4.png b/java/res/drawable-mdpi/sym_bkeyboard_num4.png
deleted file mode 100644
index 7f0f3cccc18a707ed940e095341d14777c205fc9..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_num4.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_num5.png b/java/res/drawable-mdpi/sym_bkeyboard_num5.png
deleted file mode 100644
index 5f748b416e94cd2ac0a55f3aaade64043a0b2d7b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_num5.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_num6.png b/java/res/drawable-mdpi/sym_bkeyboard_num6.png
deleted file mode 100644
index 78aae74a00f3fbfba797bb28a8ceb22e82d8ba3d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_num6.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_num7.png b/java/res/drawable-mdpi/sym_bkeyboard_num7.png
deleted file mode 100644
index 5bb874c472ff7e3897f34286328007d227b7c874..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_num7.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_num8.png b/java/res/drawable-mdpi/sym_bkeyboard_num8.png
deleted file mode 100644
index 6b58fdc8ab05e58f461641a85b25200119fa95f3..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_num8.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_num9.png b/java/res/drawable-mdpi/sym_bkeyboard_num9.png
deleted file mode 100644
index f348c92af468aa676ec39e4c0768100c08f97825..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_num9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num0.png b/java/res/drawable-mdpi/sym_keyboard_num0.png
deleted file mode 100644
index e7007c871bbfae7cd30c5ece1cbd817ecf3ce3ed..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num0.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num0_holo.png b/java/res/drawable-mdpi/sym_keyboard_num0_holo.png
deleted file mode 100644
index 2c57adf8bbcc541cae1f2497cc200493419230c0..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num0_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num1.png b/java/res/drawable-mdpi/sym_keyboard_num1.png
deleted file mode 100644
index aaac11b0c7f4971ae611ac0fde0a6bf8b4b558e1..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num1.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num1_holo.png b/java/res/drawable-mdpi/sym_keyboard_num1_holo.png
deleted file mode 100644
index 509e28f9bdd125565cf01e109469ec4c3e6148e2..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num1_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num2.png b/java/res/drawable-mdpi/sym_keyboard_num2.png
deleted file mode 100644
index 4372eb8f08c4c88d4cd0ef14c96835162107c126..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num2.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num2_holo.png b/java/res/drawable-mdpi/sym_keyboard_num2_holo.png
deleted file mode 100644
index 0da18e772f7cef49da510aab04cb8d885c96e715..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num2_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num3.png b/java/res/drawable-mdpi/sym_keyboard_num3.png
deleted file mode 100644
index 6f54c850f5aeb3b10c0c8c7fc2ff4f7abed361dd..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num3.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num3_holo.png b/java/res/drawable-mdpi/sym_keyboard_num3_holo.png
deleted file mode 100644
index e8470586f8a9546047bbd39bce63b81a24984b62..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num3_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num4.png b/java/res/drawable-mdpi/sym_keyboard_num4.png
deleted file mode 100644
index 3e50bb957cec0426554f3b5cd37353ec21899c00..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num4.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num4_holo.png b/java/res/drawable-mdpi/sym_keyboard_num4_holo.png
deleted file mode 100644
index 13c216d3addf5f1ad56c586be6a8c45c2c0b1a09..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num4_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num5.png b/java/res/drawable-mdpi/sym_keyboard_num5.png
deleted file mode 100644
index c39ef4404fc1167026bc665240b994c6ca0d10a2..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num5.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num5_holo.png b/java/res/drawable-mdpi/sym_keyboard_num5_holo.png
deleted file mode 100644
index 0065153fca3bc81ca56d58bd95cc74f2a13006f4..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num5_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num6.png b/java/res/drawable-mdpi/sym_keyboard_num6.png
deleted file mode 100644
index ea88ceb94ea9b162632fb91bbba0d806ffaf0572..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num6.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num6_holo.png b/java/res/drawable-mdpi/sym_keyboard_num6_holo.png
deleted file mode 100644
index 09fab76a1a672e69eceb56f57556d0e851fb1a2f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num6_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num7.png b/java/res/drawable-mdpi/sym_keyboard_num7.png
deleted file mode 100644
index ce800ba429808e5fac3635b589dc4d41c17d86c8..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num7.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num7_holo.png b/java/res/drawable-mdpi/sym_keyboard_num7_holo.png
deleted file mode 100644
index d350fddc8e9e49415c3c552117081c78b1a2d267..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num7_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num8.png b/java/res/drawable-mdpi/sym_keyboard_num8.png
deleted file mode 100644
index 1a8ff94bf73aa7b846cabc12e331930218683136..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num8.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num8_holo.png b/java/res/drawable-mdpi/sym_keyboard_num8_holo.png
deleted file mode 100644
index c40cb89a5c600931db13ffd25f5edde92d04330d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num8_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num9.png b/java/res/drawable-mdpi/sym_keyboard_num9.png
deleted file mode 100644
index 8b344c0a6861baf5e5f819747286b613e5e05290..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num9_holo.png b/java/res/drawable-mdpi/sym_keyboard_num9_holo.png
deleted file mode 100644
index 73526939d966309286746769e4ad730c6b4598f5..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_num9_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num0.png b/java/res/drawable-xhdpi/sym_bkeyboard_num0.png
deleted file mode 100644
index da8d50a8c90b526c26b974a30bb61d5d295b76c1..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_bkeyboard_num0.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num1.png b/java/res/drawable-xhdpi/sym_bkeyboard_num1.png
deleted file mode 100644
index 62443eb1cedb88f785584e7dad7a637c8d003171..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_bkeyboard_num1.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num2.png b/java/res/drawable-xhdpi/sym_bkeyboard_num2.png
deleted file mode 100644
index 4b3ef7ecc9e61f34c38e32b4f5348263a9d1f68c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_bkeyboard_num2.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num3.png b/java/res/drawable-xhdpi/sym_bkeyboard_num3.png
deleted file mode 100644
index 48315e499d3f896431453df1af679efeba80241a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_bkeyboard_num3.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num4.png b/java/res/drawable-xhdpi/sym_bkeyboard_num4.png
deleted file mode 100644
index 17958d7ccc0215209fa34db14b1f6f3477043c28..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_bkeyboard_num4.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num5.png b/java/res/drawable-xhdpi/sym_bkeyboard_num5.png
deleted file mode 100644
index 43716c424941fe6c19553c0ec52353e9780182e7..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_bkeyboard_num5.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num6.png b/java/res/drawable-xhdpi/sym_bkeyboard_num6.png
deleted file mode 100644
index 09f2b428d1cc4ecacf621443b4436263a6af7eea..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_bkeyboard_num6.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num7.png b/java/res/drawable-xhdpi/sym_bkeyboard_num7.png
deleted file mode 100644
index 72438ec0f7aeecf2a075b0ab285d1ae39a79193f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_bkeyboard_num7.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num8.png b/java/res/drawable-xhdpi/sym_bkeyboard_num8.png
deleted file mode 100644
index 403b53f71fd09a4eaaca8b60cc0730bd08e648a3..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_bkeyboard_num8.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num9.png b/java/res/drawable-xhdpi/sym_bkeyboard_num9.png
deleted file mode 100644
index 644c2a4df798bae3ebeaa09d42716195dd98eb32..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_bkeyboard_num9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num0.png b/java/res/drawable-xhdpi/sym_keyboard_num0.png
deleted file mode 100644
index 06bd3bfc77d2109b636bf05cd0ff749184b9600b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num0.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num0_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num0_holo.png
deleted file mode 100644
index 33e80bdc382b983696867bc4804bc6d4c29e3d2b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num0_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num1.png b/java/res/drawable-xhdpi/sym_keyboard_num1.png
deleted file mode 100644
index dfa0cfe78f80c1de83059f125fecb1f551c85790..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num1.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num1_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num1_holo.png
deleted file mode 100644
index dce3ee801e9527b029119496fac6b998e6ad4905..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num1_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num2.png b/java/res/drawable-xhdpi/sym_keyboard_num2.png
deleted file mode 100644
index 4bd2ead0882982cb16dc3681ff28c5ebb39ed9f8..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num2.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num2_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num2_holo.png
deleted file mode 100644
index e776efb33cc85aec66626428b35d9a10d2dd30d0..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num2_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num3.png b/java/res/drawable-xhdpi/sym_keyboard_num3.png
deleted file mode 100644
index 39db11228188d55a0c0652120828edb4fe53693b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num3.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num3_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num3_holo.png
deleted file mode 100644
index 66e7b373581b43328a9a259478baaeed3ae5edfa..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num3_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num4.png b/java/res/drawable-xhdpi/sym_keyboard_num4.png
deleted file mode 100644
index 60356947e4f3367ab84613c89672598fc3065de0..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num4.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num4_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num4_holo.png
deleted file mode 100644
index bf70e28902e9cc565391561c5d93065a66edb50f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num4_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num5.png b/java/res/drawable-xhdpi/sym_keyboard_num5.png
deleted file mode 100644
index 3238b3f403dfbcf6022c8639fcb0efa458eb47ea..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num5.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num5_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num5_holo.png
deleted file mode 100644
index 98d0b5cc9569d22bc21444b33bc638648eee9d6f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num5_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num6.png b/java/res/drawable-xhdpi/sym_keyboard_num6.png
deleted file mode 100644
index c8da5a9d0558b691ad135ad1ed6044e9c7caff46..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num6.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num6_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num6_holo.png
deleted file mode 100644
index 67340ef6a76570e81f8c97adb898b82c7c43e118..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num6_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num7.png b/java/res/drawable-xhdpi/sym_keyboard_num7.png
deleted file mode 100644
index 553cf5f0de3bd74dd3212cdea2f4efd486a4cb6c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num7.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num7_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num7_holo.png
deleted file mode 100644
index 8432249541c5cbf7ef753a24379abc2870f6fa82..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num7_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num8.png b/java/res/drawable-xhdpi/sym_keyboard_num8.png
deleted file mode 100644
index eaaf53390091296598a125676eb707567db5f7cb..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num8.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num8_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num8_holo.png
deleted file mode 100644
index 6d520bca9585747a3ac7b7dab16a2e7ebef4110b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num8_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num9.png b/java/res/drawable-xhdpi/sym_keyboard_num9.png
deleted file mode 100644
index b510d3774bc243efe5ced7dd9e6980f33d0c2846..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num9.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num9_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num9_holo.png
deleted file mode 100644
index 158c879578968c2ed430918378795a3a711ab534..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_num9_holo.png and /dev/null differ
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
index 8f6eb23392bcee0d91ac041cb780dec80f3fd65e..d6e096278d15e800744a95e13fa445e462918669 100644
--- a/java/res/values-land/dimens.xml
+++ b/java/res/values-land/dimens.xml
@@ -33,13 +33,21 @@
<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>
+
+ <!-- left or right padding of label alignment -->
+ <dimen name="key_label_horizontal_alignment_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_uppercase_letter_ratio">40%</fraction>
<fraction name="key_preview_text_ratio">90%</fraction>
<dimen name="key_preview_offset">0.08in</dimen>
+
<dimen name="key_preview_offset_ics">0.01in</dimen>
+
<dimen name="candidate_strip_height">38dip</dimen>
<dimen name="candidate_strip_fading_edge_length">63dip</dimen>
<!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml
index 6e583e3bf5c9ae8dc7d7d716ed359ee2a88eb646..5d1fbc74861437a166a24c26a37c11fd42facc1d 100644
--- a/java/res/values-sw600dp-land/dimens.xml
+++ b/java/res/values-sw600dp-land/dimens.xml
@@ -34,11 +34,15 @@
<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>
+
<fraction name="key_letter_ratio">45%</fraction>
+ <fraction name="key_large_letter_ratio">45%</fraction>
<fraction name="key_label_ratio">32%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction>
+ <fraction name="key_hint_label_ratio">34%</fraction>
<fraction name="key_uppercase_letter_ratio">29%</fraction>
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_alignment_padding">18dip</dimen>
+
<dimen name="candidate_strip_padding">40.0mm</dimen>
</resources>
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml
index 274b62b4ce8b7c1a5ff486bf079a61dc5c9c9c01..675f40c2e7abc8bc37af03ba2a83f9853fc617ad 100644
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-sw600dp/dimens.xml
@@ -41,16 +41,21 @@
<!-- popup_key_height x -1.0 -->
<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>
+
<fraction name="key_letter_ratio">37%</fraction>
+ <fraction name="key_large_letter_ratio">37%</fraction>
<fraction name="key_label_ratio">22%</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_preview_text_ratio">50%</fraction>
<dimen name="key_preview_height">15.0mm</dimen>
<dimen name="key_preview_offset">0.1in</dimen>
+
+ <dimen name="key_preview_height_ics">15.0mm</dimen>
<dimen name="key_preview_offset_ics">0.05in</dimen>
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_alignment_padding">6dip</dimen>
<dimen name="candidate_strip_height">46dip</dimen>
<dimen name="candidate_strip_padding">15.0mm</dimen>
diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml
index 74eb08aa30294a2d16bc4ab9db995e111b0064d6..2201ce8a364c37070e5dbb29d198a116537c225d 100644
--- a/java/res/values-sw768dp-land/dimens.xml
+++ b/java/res/values-sw768dp-land/dimens.xml
@@ -35,15 +35,19 @@
<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>
+
<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_hint_letter_ratio">23%</fraction>
+ <fraction name="key_hint_label_ratio">26%</fraction>
<fraction name="key_uppercase_letter_ratio">24%</fraction>
<dimen name="key_preview_height">17.0mm</dimen>
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_alignment_padding">18dip</dimen>
- <dimen name="key_preview_height_holo">26.5mm</dimen>
- <dimen name="key_preview_offset_holo">7.5mm</dimen>
+
+ <dimen name="key_preview_height_ics">26.5mm</dimen>
+ <dimen name="key_preview_offset_ics">0.05in</dimen>
<dimen name="candidate_strip_padding">40.0mm</dimen>
</resources>
diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml
index b5d5a8496d3ef7ea04ad25449899f7a4f8538ab7..2e41db52a17161755a8f01d4bd3507e2ca167eaf 100644
--- a/java/res/values-sw768dp/dimens.xml
+++ b/java/res/values-sw768dp/dimens.xml
@@ -35,7 +35,7 @@
<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_holo">40dip</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 -->
@@ -43,16 +43,21 @@
<!-- popup_key_height x -1.0 -->
<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>
+
<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_hint_letter_ratio">23%</fraction>
+ <fraction name="key_hint_label_ratio">26%</fraction>
<fraction name="key_uppercase_letter_ratio">25%</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>
+
+ <dimen name="key_preview_height_ics">15.0mm</dimen>
<dimen name="key_preview_offset_ics">0.05in</dimen>
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_alignment_padding">6dip</dimen>
<dimen name="candidate_strip_height">46dip</dimen>
<!-- candidate_strip_minimum_height =
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index e9b6354a5bd12bddc039ee1d28dba38562434ed0..6dabb0cb922e330d3556987653a83c23d6a774a1 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -41,10 +41,15 @@
<!-- Size of the text for one letter keys, in the proportion of key height. -->
<attr name="keyLetterRatio" format="float" />
+ <!-- Large size of the text for one letter keys, in the proportion of key height. -->
+ <attr name="keyLargeLetterRatio" format="float" />
<!-- Size of the text for keys with some text, in the proportion of key height. -->
<attr name="keyLabelRatio" format="float" />
- <!-- Size of the text for hint letter, in the proportion of key height. -->
+ <!-- Size of the text for hint letter (= one character hint label), in the proportion of
+ key height. -->
<attr name="keyHintLetterRatio" format="float" />
+ <!-- Size of the text for hint label, in the proportion of key height. -->
+ <attr name="keyHintLabelRatio" format="float" />
<!-- Size of the text for upper case letter, in the proportion of key height. -->
<attr name="keyUppercaseLetterRatio" format="float" />
@@ -52,8 +57,10 @@
<attr name="keyTextColor" format="color" />
<!-- Color to use for the label in a key when in inactivated state. -->
<attr name="keyTextInactivatedColor" format="color" />
- <!-- Key hint letter color -->
+ <!-- Key hint letter (= one character hint label) color -->
<attr name="keyHintLetterColor" format="color" />
+ <!-- Key hint label color -->
+ <attr name="keyHintLabelColor" format="color" />
<!-- Upper case letter colors -->
<attr name="keyUppercaseLetterInactivatedColor" format="color" />
<attr name="keyUppercaseLetterActivatedColor" format="color" />
@@ -67,6 +74,8 @@
<attr name="keyPreviewOffset" format="dimension" />
<!-- Height of the key press feedback popup. -->
<attr name="keyPreviewHeight" format="dimension" />
+ <!-- Size of the text for key press feedback popup, int the proportion of key height -->
+ <attr name="keyPreviewTextRatio" format="float" />
<!-- Hysteresis distance for key debouncing -->
<attr name="keyHysteresisDistance" format="dimension" />
@@ -146,16 +155,6 @@
<attr name="iconReturnKey" format="reference" />
<attr name="iconSearchKey" format="reference" />
<attr name="iconTabKey" format="reference" />
- <attr name="iconNum1Key" format="reference" />
- <attr name="iconNum2Key" format="reference" />
- <attr name="iconNum3Key" format="reference" />
- <attr name="iconNum4Key" format="reference" />
- <attr name="iconNum5Key" format="reference" />
- <attr name="iconNum6Key" format="reference" />
- <attr name="iconNum7Key" format="reference" />
- <attr name="iconNum8Key" format="reference" />
- <attr name="iconNum9Key" format="reference" />
- <attr name="iconNum0Key" format="reference" />
<attr name="iconShiftedShiftKey" format="reference" />
<attr name="iconPreviewSpaceKey" format="reference" />
<attr name="iconPreviewTabKey" format="reference" />
@@ -187,19 +186,23 @@
<attr name="keyOutputText" format="string" />
<!-- The label to display on the key. -->
<attr name="keyLabel" format="string" />
- <!-- The hint letter to display on the key in conjunction with the label. -->
- <attr name="keyHintLetter" format="string" />
+ <!-- The hint label to display on the key in conjunction with the label. -->
+ <attr name="keyHintLabel" format="string" />
<!-- The key label option. -->
<attr name="keyLabelOption" format="integer">
<!-- This should be aligned with Key.LABEL_OPTION_* -->
<flag name="alignLeft" value="0x01" />
<flag name="alignRight" value="0x02" />
- <flag name="alignBottom" value="0x08" />
- <flag name="fontNormal" value="0x10" />
- <flag name="fontFixedWidth" value="0x20" />
- <flag name="followKeyLetterRatio" value="0x40" />
- <flag name="popupHint" value="0x80" />
- <flag name="hasUppercaseLetter" value="0x100" />
+ <flag name="alignBottom" value="0x04" />
+ <flag name="alignLeftOfCenter" value="0x08" />
+ <flag name="largeLetter" value="0x10" />
+ <flag name="fontNormal" value="0x20" />
+ <flag name="fontMonoSpace" value="0x40" />
+ <flag name="followKeyLetterRatio" value="0x80" />
+ <flag name="followKeyHintLabelRatio" value="0x100" />
+ <flag name="hasPopupHint" value="0x200" />
+ <flag name="hasUppercaseLetter" value="0x400" />
+ <flag name="hasHintLabel" value="0x800" />
</attr>
<!-- The icon to display on the key instead of the label. -->
<attr name="keyIcon" format="enum">
@@ -214,29 +217,19 @@
<enum name="iconReturnKey" value="8" />
<enum name="iconSearchKey" value="9" />
<enum name="iconTabKey" value="10" />
- <enum name="iconNum1Key" value="11" />
- <enum name="iconNum2Key" value="12" />
- <enum name="iconNum3Key" value="13" />
- <enum name="iconNum4Key" value="14" />
- <enum name="iconNum5Key" value="15" />
- <enum name="iconNum6Key" value="16" />
- <enum name="iconNum7Key" value="17" />
- <enum name="iconNum8Key" value="18" />
- <enum name="iconNum9Key" value="19" />
- <enum name="iconNum0Key" value="20" />
</attr>
<!-- Shift key icon for shifted state -->
<attr name="keyIconShifted" format="enum">
<!-- This should be aligned with KeyboardIcons.ICON_SHIFTED_* -->
- <enum name="iconShiftedShiftKey" value="21" />
+ <enum name="iconShiftedShiftKey" value="11" />
</attr>
<!-- The icon to show in the popup preview. -->
<attr name="keyIconPreview" format="enum">
<!-- This should be aligned with KeyboardIcons.ICON_PREVIEW_* -->
- <enum name="iconPreviewSpaceKey" value="22" />
- <enum name="iconPreviewTabKey" value="23" />
- <enum name="iconPreviewSettingsKey" value="24" />
- <enum name="iconPreviewShortcutKey" value="25" />
+ <enum name="iconPreviewSpaceKey" value="12" />
+ <enum name="iconPreviewTabKey" value="13" />
+ <enum name="iconPreviewSettingsKey" value="14" />
+ <enum name="iconPreviewShortcutKey" value="15" />
</attr>
<!-- The key style to specify a set of key attributes defined by <key_style/> -->
<attr name="keyStyle" format="string" />
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index a2332df962cf45ceecd90c0c4dc39b2b019b4a7f..0dd1be3d28c4aa2103ba19107f084856f723a843 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -32,14 +32,16 @@
<dimen name="keyboard_bottom_padding">0.06in</dimen>
<dimen name="key_bottom_gap_stone">0.00in</dimen>
<dimen name="key_horizontal_gap_stone">0.00in</dimen>
+ <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen>
+ <dimen name="mini_keyboard_horizontal_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_top_padding_ics">0.03in</dimen>
<dimen name="keyboard_bottom_padding_ics">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_padding_holo">38dip</dimen>
- <dimen name="mini_keyboard_key_horizontal_padding">8dip</dimen>
+ <dimen name="mini_keyboard_horizontal_padding_ics">38dip</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">0.396in</dimen>
@@ -49,15 +51,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_uppercase_letter_ratio">35%</fraction>
- <!-- left or right padding of label alignment -->
- <dimen name="key_label_horizontal_alignment_padding">21dip</dimen>
<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_preview_height_ics">80sp</dimen>
<dimen name="key_preview_offset_ics">0.05in</dimen>
<dimen name="candidate_strip_height">42dip</dimen>
diff --git a/java/res/values/keyboard-icons-black.xml b/java/res/values/keyboard-icons-black.xml
index 3ba34558060d9770782ca37dc0f8f0a2ee65e1b6..89631bb011fa6938b8e3e70224f83cf6034acf87 100644
--- a/java/res/values/keyboard-icons-black.xml
+++ b/java/res/values/keyboard-icons-black.xml
@@ -26,16 +26,6 @@
<item name="iconReturnKey">@drawable/sym_bkeyboard_return</item>
<item name="iconSearchKey">@drawable/sym_bkeyboard_search</item>
<item name="iconTabKey">@drawable/sym_bkeyboard_tab</item>
- <item name="iconNum1Key">@drawable/sym_bkeyboard_num1</item>
- <item name="iconNum2Key">@drawable/sym_bkeyboard_num2</item>
- <item name="iconNum3Key">@drawable/sym_bkeyboard_num3</item>
- <item name="iconNum4Key">@drawable/sym_bkeyboard_num4</item>
- <item name="iconNum5Key">@drawable/sym_bkeyboard_num5</item>
- <item name="iconNum6Key">@drawable/sym_bkeyboard_num6</item>
- <item name="iconNum7Key">@drawable/sym_bkeyboard_num7</item>
- <item name="iconNum8Key">@drawable/sym_bkeyboard_num8</item>
- <item name="iconNum9Key">@drawable/sym_bkeyboard_num9</item>
- <item name="iconNum0Key">@drawable/sym_bkeyboard_num0</item>
<item name="iconShiftedShiftKey">@drawable/sym_bkeyboard_shift_locked</item>
<item name="iconPreviewSpaceKey">@drawable/sym_keyboard_feedback_space</item>
<item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml
index 1dfbdf96ef0ed6736c783e1625893746e55c1f7c..feb95f8348ea2121b0ac44497fa40cf3f554ed7c 100644
--- a/java/res/values/keyboard-icons-ics.xml
+++ b/java/res/values/keyboard-icons-ics.xml
@@ -17,62 +17,44 @@
<resources>
<style name="KeyboardIcons.IceCreamSandwich" parent="android:Theme.Holo">
<!-- Keyboard icons -->
-<!-- <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item> -->
- <item name="iconShiftKey">@drawable/sym_keyboard_shift</item>
-<!-- <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_voice_holo</item> -->
- <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic</item>
-<!-- <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item> -->
- <item name="iconDeleteKey">@drawable/sym_keyboard_delete</item>
-<!-- <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item> -->
- <item name="iconSettingsKey">@drawable/sym_keyboard_settings</item>
-<!-- <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item> -->
- <item name="iconShortcutKey">@drawable/sym_keyboard_mic</item>
-<!-- <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</item> -->
- <item name="iconSpaceKey">@drawable/sym_keyboard_space</item>
-<!-- <item name="iconReturnKey">@drawable/sym_keyboard_return_holo</item> -->
- <item name="iconReturnKey">@drawable/sym_keyboard_return</item>
-<!-- <item name="iconSearchKey">@drawable/sym_keyboard_search_holo</item> -->
+ <!-- TODO: The following holo icon for phone (drawable-hdpi and drawable-xhdpi) are too
+ large for phone.
+ sym_keyboard_shift_holo
+ sym_keyboard_shift_locked_holo
+ sym_keyboard_delete_holo,
+ sym_keyboard_settings_holo
+ sym_keyboard_voice_holo
+ sym_keyboard_voice_holo_off
+ sym_keyboard_space_holo
+ sym_keyboard_return_holo
+ sym_keyboard_tab_holo
+ -->
+ <!-- TODO: The following holo icon for phone (drawable-hdpi and drawable-xhdpi) are missing.
+ sym_keyboard_123_mic_holo
+ sym_keyboard_search_holo
+ sym_keyboard_feedback_tab_holo
+ sym_keyboard_feedback_voice_holo
+ -->
+ <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item>
+ <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic_holo</item>
+ <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item>
+ <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item>
+ <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item>
+ <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</item>
+ <item name="iconReturnKey">@drawable/sym_keyboard_return_holo</item>
<item name="iconSearchKey">@drawable/sym_keyboard_search</item>
-<!-- <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item> -->
- <item name="iconTabKey">@drawable/sym_keyboard_tab</item>
-<!-- <item name="iconNum1Key">@drawable/sym_keyboard_num1_holo</item> -->
-<!-- <item name="iconNum2Key">@drawable/sym_keyboard_num2_holo</item> -->
-<!-- <item name="iconNum3Key">@drawable/sym_keyboard_num3_holo</item> -->
-<!-- <item name="iconNum4Key">@drawable/sym_keyboard_num4_holo</item> -->
-<!-- <item name="iconNum5Key">@drawable/sym_keyboard_num5_holo</item> -->
-<!-- <item name="iconNum6Key">@drawable/sym_keyboard_num6_holo</item> -->
-<!-- <item name="iconNum7Key">@drawable/sym_keyboard_num7_holo</item> -->
-<!-- <item name="iconNum8Key">@drawable/sym_keyboard_num8_holo</item> -->
-<!-- <item name="iconNum9Key">@drawable/sym_keyboard_num9_holo</item> -->
-<!-- <item name="iconNum0Key">@drawable/sym_keyboard_num0_holo</item> -->
-<!-- <item name="iconNumStarKey">@drawable/sym_keyboard_numbstar_holo</item> -->
-<!-- <item name="iconNumPoundKey">@drawable/sym_keyboard_numbpound_holo</item> -->
-<!-- <item name="iconNumAltKey">@drawable/sym_keyboard_numalt_holo</item> -->
- <item name="iconNum1Key">@drawable/sym_keyboard_num1</item>
- <item name="iconNum2Key">@drawable/sym_keyboard_num2</item>
- <item name="iconNum3Key">@drawable/sym_keyboard_num3</item>
- <item name="iconNum4Key">@drawable/sym_keyboard_num4</item>
- <item name="iconNum5Key">@drawable/sym_keyboard_num5</item>
- <item name="iconNum6Key">@drawable/sym_keyboard_num6</item>
- <item name="iconNum7Key">@drawable/sym_keyboard_num7</item>
- <item name="iconNum8Key">@drawable/sym_keyboard_num8</item>
- <item name="iconNum9Key">@drawable/sym_keyboard_num9</item>
- <item name="iconNum0Key">@drawable/sym_keyboard_num0</item>
-<!-- <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item> -->
- <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked</item>
+ <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item>
+ <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item>
<item name="iconPreviewSpaceKey">@drawable/transparent</item>
-<!-- <item name="iconPreviewTabKey">@drawable/sym_keyboard_tab_holo</item> -->
<item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
-<!-- <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings_holo</item> -->
- <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings</item>
-<!-- <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_voice_holo</item> -->
+ <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings_holo</item>
<item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item>
<!-- LatinKeyboard icons -->
<item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
<item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
<item name="spacebarArrowLeftIcon">@drawable/sym_keyboard_language_arrows_left</item>
<item name="spacebarArrowRightIcon">@drawable/sym_keyboard_language_arrows_right</item>
-<!-- <item name="spacebarArrowPreviewLeftIcon">@drawable/sym_keyboard_feedback_language_arrows_left</item> -->
-<!-- <item name="spacebarArrowPreviewRightIcon">@drawable/sym_keyboard_feedback_language_arrows_right</item> -->
+ <item name="spacebarArrowPreviewLeftIcon">@null</item>
+ <item name="spacebarArrowPreviewRightIcon">@null</item>
</style>
</resources>
diff --git a/java/res/values/keyboard-icons-white.xml b/java/res/values/keyboard-icons-white.xml
index 9f5fb5a5b0513e60c82369b166b15d0bad28630d..f9726d1576b2193320b5590065cde63b7c4a80bb 100644
--- a/java/res/values/keyboard-icons-white.xml
+++ b/java/res/values/keyboard-icons-white.xml
@@ -26,16 +26,6 @@
<item name="iconReturnKey">@drawable/sym_keyboard_return</item>
<item name="iconSearchKey">@drawable/sym_keyboard_search</item>
<item name="iconTabKey">@drawable/sym_keyboard_tab</item>
- <item name="iconNum1Key">@drawable/sym_keyboard_num1</item>
- <item name="iconNum2Key">@drawable/sym_keyboard_num2</item>
- <item name="iconNum3Key">@drawable/sym_keyboard_num3</item>
- <item name="iconNum4Key">@drawable/sym_keyboard_num4</item>
- <item name="iconNum5Key">@drawable/sym_keyboard_num5</item>
- <item name="iconNum6Key">@drawable/sym_keyboard_num6</item>
- <item name="iconNum7Key">@drawable/sym_keyboard_num7</item>
- <item name="iconNum8Key">@drawable/sym_keyboard_num8</item>
- <item name="iconNum9Key">@drawable/sym_keyboard_num9</item>
- <item name="iconNum0Key">@drawable/sym_keyboard_num0</item>
<item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked</item>
<item name="iconPreviewSpaceKey">@drawable/sym_keyboard_feedback_space</item>
<item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 05defcb5263da5443d765778e49e2cb163d257c8..ff91e9ef10fc846f9d81e3bc81c12e91a0522328 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -37,19 +37,23 @@
<item name="android:background">@drawable/keyboard_background</item>
<item name="keyBackground">@drawable/btn_keyboard_key</item>
<item name="keyLetterRatio">@fraction/key_letter_ratio</item>
+ <item name="keyLargeLetterRatio">@fraction/key_large_letter_ratio</item>
<item name="keyLabelRatio">@fraction/key_label_ratio</item>
<item name="keyHintLetterRatio">@fraction/key_hint_letter_ratio</item>
+ <item name="keyHintLabelRatio">@fraction/key_hint_label_ratio</item>
<item name="keyUppercaseLetterRatio">@fraction/key_uppercase_letter_ratio</item>
<item name="keyTextStyle">normal</item>
<item name="keyTextColor">#FFFFFFFF</item>
<item name="keyTextInactivatedColor">#FFFFFFFF</item>
<item name="keyHintLetterColor">#80000000</item>
+ <item name="keyHintLabelColor">#E0E0E4E5</item>
<item name="keyUppercaseLetterInactivatedColor">#66E0E4E5</item>
<item name="keyUppercaseLetterActivatedColor">#CCE0E4E5</item>
<item name="keyPopupHintIcon">@drawable/hint_popup</item>
<item name="keyPreviewLayout">@layout/key_preview</item>
<item name="keyPreviewOffset">@dimen/key_preview_offset</item>
<item name="keyPreviewHeight">@dimen/key_preview_height</item>
+ <item name="keyPreviewTextRatio">@fraction/key_preview_text_ratio</item>
<item name="popupLayout">@layout/keyboard_popup</item>
<item name="keyHysteresisDistance">@dimen/key_hysteresis_distance</item>
<item name="verticalCorrection">@dimen/keyboard_vertical_correction</item>
@@ -106,6 +110,10 @@
<item name="keyBackground">@drawable/btn_keyboard_key_stone</item>
<item name="keyTextColor">#FF000000</item>
<item name="keyTextInactivatedColor">#FF808080</item>
+ <item name="keyHintLetterColor">#80FFFFFF</item>
+ <item name="keyHintLabelColor">#E0000000</item>
+ <item name="keyUppercaseLetterInactivatedColor">#66000000</item>
+ <item name="keyUppercaseLetterActivatedColor">#CC000000</item>
<item name="shadowColor">#FFFFFFFF</item>
</style>
<style name="PopupMiniKeyboardView.Stone" parent="PopupMiniKeyboardView">
@@ -142,10 +150,10 @@
<item name="keyTextStyle">bold</item>
<item name="keyTextInactivatedColor">#66E0E4E5</item>
<item name="keyHintLetterColor">#80000000</item>
+ <item name="keyHintLabelColor">#A0FFFFFF</item>
<item name="keyUppercaseLetterInactivatedColor">#66E0E4E5</item>
<item name="keyUppercaseLetterActivatedColor">#FFFFFFFF</item>
- <item name="keyPopupHintIcon">@drawable/hint_popup</item>
- <item name="keyPreviewHeight">@dimen/key_preview_height</item>
+ <item name="keyPreviewHeight">@dimen/key_preview_height_ics</item>
<item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item>
<item name="shadowColor">#00000000</item>
<item name="shadowRadius">0.0</item>
@@ -159,8 +167,8 @@
</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_holo</item>
- <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_padding_holo</item>
+ <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_padding_ics</item>
+ <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_padding_ics</item>
</style>
<style name="SuggestionsStripBackgroundStyle.IceCreamSandwich">
<item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml
index e8e80ac03e91e78f1d0303f9fb072bebf683914a..dbea4dcfd2e424bbb60a1a44fa31420a4c99cdbf 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/kbd_key_styles.xml
@@ -37,7 +37,7 @@
<default>
<key-style
latin:styleName="settingsPopupStyle"
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="\@icon/5|\@integer/key_settings"
latin:parentStyle="functionalKeyStyle" />
</default>
@@ -73,7 +73,7 @@
latin:styleName="smileyKeyStyle"
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5" />
<key-style
@@ -116,7 +116,7 @@
<key-style
latin:styleName="comKeyStyle"
latin:keyLabel="@string/keylabel_for_popular_domain"
- latin:keyLabelOption="fontNormal|popupHint"
+ latin:keyLabelOption="fontNormal|hasPopupHint"
latin:keyOutputText="@string/keylabel_for_popular_domain"
latin:popupCharacters="@string/alternates_for_popular_domain" />
<switch>
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index 2c7af0ae2dfd085081110fff6016cd56189eac1e..b3a1010d74ea050a12a514d3cced01cf6f272319 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -91,24 +91,27 @@
<Row>
<Key
latin:keyLabel="-"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="+"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="."
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="1"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="38.75%p" />
<Key
- latin:keyLabel="2" />
+ latin:keyLabel="2"
+ latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="3" />
+ latin:keyLabel="3"
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.00%p"
@@ -117,25 +120,27 @@
</Row>
<Row>
<Key
- latin:keyLabel="*"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numStarKeyStyle"
latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="/"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel=","
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="4"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="38.75%p" />
<Key
- latin:keyLabel="5" />
+ latin:keyLabel="5"
+ latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="6" />
+ latin:keyLabel="6"
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-11.00%p"
@@ -148,24 +153,27 @@
edge key. -->
<Key
latin:keyLabel="("
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel=")"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="="
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="7"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="38.75%p" />
<Key
- latin:keyLabel="8" />
+ latin:keyLabel="8"
+ latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="9" />
+ latin:keyLabel="9"
+ latin:keyStyle="numKeyStyle" />
</Row>
<!-- This row is intentionally not marked as a bottom row -->
<Row>
@@ -180,10 +188,11 @@
latin:keyStyle="numStarKeyStyle"
latin:keyXPos="38.75%p" />
<Key
- latin:keyLabel="0" />
+ latin:keyLabel="0"
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyLabel="#"
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<Spacer
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index 4dee882e9fc4a2a03878382fc8df511b8a856319..dd53a206a1fc3bd3372a95147c9321a561833bb6 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -30,12 +30,12 @@
<Row>
<Key
latin:keyLabel="-"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="15.625%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="+"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num1KeyStyle"
@@ -53,12 +53,12 @@
<Row>
<Key
latin:keyLabel=","
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="15.625%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="."
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num4KeyStyle"
@@ -82,12 +82,12 @@
the touch event on the area, "(" is intentionally not marked as a left edge key. -->
<Key
latin:keyLabel="("
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="15.625%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel=")"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num7KeyStyle"
@@ -114,7 +114,7 @@
latin:keyStyle="num0KeyStyle" />
<Key
latin:keyLabel="#"
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<Spacer
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
index 87de880d90bba78d3208106086c1fdc4b6e10736..d083ecb6055891efee9e2b9205d59d470bf34f5b 100644
--- a/java/res/xml-sw600dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -30,12 +30,12 @@
<Row>
<Key
latin:keyLabel="-"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="+"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:code="44"
@@ -57,12 +57,12 @@
<Row>
<Key
latin:keyLabel=","
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="11.00%p"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="."
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:code="59"
@@ -90,15 +90,15 @@
the touch event on the area, "(" is intentionally not marked as a left edge key. -->
<Key
latin:keyLabel="("
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel=")"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyLabel="N"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="9.25%p" />
<Key
latin:keyStyle="num7KeyStyle"
@@ -124,7 +124,7 @@
latin:keyStyle="num0KeyStyle" />
<Key
latin:keyLabel="#"
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<Spacer
latin:keyXPos="-11.00%p"
latin:keyWidth="0%p" />
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row3.xml b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
index 0dbc5cf660c695e2060d9bdc0704b86351c9c94f..278db13fce4ca5b56ae911314414548cc8bea54d 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row3.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row3.xml
@@ -59,12 +59,12 @@
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="!"
+ latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\?"
+ latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
index 8fd65fe0e61874320d8053c0971449eb9f96e76b..4f41c17b415a3b86949c802ddb9781a47029d837 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
@@ -49,7 +49,7 @@
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\@"
+ latin:keyHintLabel="\@"
latin:popupCharacters="\@" />
</default>
</switch>
@@ -75,7 +75,7 @@
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter=":"
+ latin:keyHintLabel=":"
latin:popupCharacters=":"
latin:keyWidth="9.750%p" />
</case>
@@ -83,7 +83,7 @@
<Key
latin:keyLabel="\?"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="_"
+ latin:keyHintLabel="_"
latin:popupCharacters="_"
latin:keyWidth="9.750%p" />
</default>
@@ -100,7 +100,7 @@
<Key
latin:keyLabel="!"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\'"
+ latin:keyHintLabel="\'"
latin:popupCharacters="\'"
latin:keyWidth="9.750%p" />
</default>
@@ -122,7 +122,7 @@
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter=":"
+ latin:keyHintLabel=":"
latin:popupCharacters=":"
latin:keyWidth="9.750%p" />
</case>
@@ -130,7 +130,7 @@
<Key
latin:keyLabel="\'"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="""
+ latin:keyHintLabel="""
latin:popupCharacters="""
latin:keyWidth="9.750%p" />
</default>
@@ -147,7 +147,7 @@
<Key
latin:keyLabel="-"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="_"
+ latin:keyHintLabel="_"
latin:popupCharacters="_"
latin:keyWidth="9.750%p" />
</default>
diff --git a/java/res/xml-sw600dp/kbd_row3_right.xml b/java/res/xml-sw600dp/kbd_row3_right.xml
index a9c5eb37125cb4cc17d66dc51862a0d8a40a368c..5e9584f2dc9f7f108e2283406fdfa61508f71b43 100644
--- a/java/res/xml-sw600dp/kbd_row3_right.xml
+++ b/java/res/xml-sw600dp/kbd_row3_right.xml
@@ -37,7 +37,7 @@
<Key
latin:keyLabel="-"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="_"
+ latin:keyHintLabel="_"
latin:popupCharacters="_"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth"
@@ -49,7 +49,7 @@
<Key
latin:keyLabel=":"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="+"
+ latin:keyHintLabel="+"
latin:popupCharacters="+"
latin:keyXPos="-8.9%p"
latin:keyWidth="fillBoth"
diff --git a/java/res/xml-sw600dp/kbd_rows_azerty.xml b/java/res/xml-sw600dp/kbd_rows_azerty.xml
index b53bbbbf9880e27d929c7c724b42de9831cc9684..7ba716bc5d1a1c79f2803fd9c414aa55f8578fac 100644
--- a/java/res/xml-sw600dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw600dp/kbd_rows_azerty.xml
@@ -139,12 +139,12 @@
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="!"
+ latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\?"
+ latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-sw600dp/kbd_rows_qwertz.xml b/java/res/xml-sw600dp/kbd_rows_qwertz.xml
index 7ea9b0f376599de7e1c3b4b658667fc01d15d2f5..7f85fe778ebe33e23251da9e5d1dbc2901877a3e 100644
--- a/java/res/xml-sw600dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw600dp/kbd_rows_qwertz.xml
@@ -104,12 +104,12 @@
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="!"
+ latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\?"
+ latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-sw600dp/kbd_rows_russian.xml b/java/res/xml-sw600dp/kbd_rows_russian.xml
index 43fa665e6c0afaf5783faf1f9d5b617d9748701c..b72324745ad151d0a259b4b673ee6c50844b0156 100644
--- a/java/res/xml-sw600dp/kbd_rows_russian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_russian.xml
@@ -119,7 +119,7 @@
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter=","
+ latin:keyHintLabel=","
latin:popupCharacters="," />
<include
latin:keyboardLayout="@xml/kbd_row3_right" />
diff --git a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
index 3666ead5116d9c0885a0f959e483a12f78b19401..645ef625ab8560307ab301ea172dd1daa488d7b6 100644
--- a/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_scandinavian.xml
@@ -147,12 +147,12 @@
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="!"
+ latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\?"
+ latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-sw600dp/kbd_rows_serbian.xml b/java/res/xml-sw600dp/kbd_rows_serbian.xml
index 80debdadbfc2f7bb2c6e4f2ad7b53e083d4b7607..4dfe9440000892987e413a4dba4b0836da644c35 100644
--- a/java/res/xml-sw600dp/kbd_rows_serbian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_serbian.xml
@@ -127,12 +127,12 @@
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="!"
+ latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\?"
+ latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml
index 5d8c081a6de24eabfd19b8dd4dc418139f7f9c30..4c1e3b63e256094958a7e8b76e959e97007cb2e1 100644
--- a/java/res/xml-sw768dp/kbd_key_styles.xml
+++ b/java/res/xml-sw768dp/kbd_key_styles.xml
@@ -55,7 +55,7 @@
latin:styleName="smileyKeyStyle"
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5" />
<key-style
@@ -98,7 +98,7 @@
<key-style
latin:styleName="comKeyStyle"
latin:keyLabel="@string/keylabel_for_popular_domain"
- latin:keyLabelOption="fontNormal|popupHint"
+ latin:keyLabelOption="fontNormal|hasPopupHint"
latin:keyOutputText="@string/keylabel_for_popular_domain"
latin:popupCharacters="@string/alternates_for_popular_domain" />
<switch>
diff --git a/java/res/xml-sw768dp/kbd_number.xml b/java/res/xml-sw768dp/kbd_number.xml
index 1ae6984a5fe495f6bda8773be4c77d34dfbf7217..a3bed2f3a2b6686a7f1ba20752b6a1c0a7a7d6b9 100644
--- a/java/res/xml-sw768dp/kbd_number.xml
+++ b/java/res/xml-sw768dp/kbd_number.xml
@@ -98,24 +98,27 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="-"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="13.829%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="+"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="."
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="1"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="43.125%p" />
<Key
- latin:keyLabel="2" />
+ latin:keyLabel="2"
+ latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="3" />
+ latin:keyLabel="3"
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyXPos="-11.172%p"
@@ -124,25 +127,27 @@
</Row>
<Row>
<Key
- latin:keyLabel="*"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numStarKeyStyle"
latin:keyXPos="13.829%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="/"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel=","
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="4"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="43.125%p" />
<Key
- latin:keyLabel="5" />
+ latin:keyLabel="5"
+ latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="6" />
+ latin:keyLabel="6"
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyXPos="-11.172%p"
@@ -155,24 +160,27 @@
edge key. -->
<Key
latin:keyLabel="("
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="13.829%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel=")"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="="
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="7"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="43.125%p" />
<Key
- latin:keyLabel="8" />
+ latin:keyLabel="8"
+ latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="9" />
+ latin:keyLabel="9"
+ latin:keyStyle="numKeyStyle" />
<!-- There is an empty area below the "Enter" key and right of the "9" key. To
ignore the touch event on the area, "9" is intentionally not marked as a right
edge key. -->
@@ -191,14 +199,14 @@
latin:keyXPos="13.829%p"
latin:keyWidth="24.140%p" />
<Key
- latin:keyLabel="*"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numStarKeyStyle"
latin:keyXPos="43.125%p" />
<Key
- latin:keyLabel="0" />
+ latin:keyLabel="0"
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyLabel="#"
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<switch>
<case
latin:voiceKeyEnabled="true"
diff --git a/java/res/xml-sw768dp/kbd_phone.xml b/java/res/xml-sw768dp/kbd_phone.xml
index 6801ac5cc4dedf878bccbc5bf178e20097c32db1..0935992fdcebce8acab16577fd32866b54a5022e 100644
--- a/java/res/xml-sw768dp/kbd_phone.xml
+++ b/java/res/xml-sw768dp/kbd_phone.xml
@@ -35,12 +35,12 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="-"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="20.400%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="+"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyStyle="num1KeyStyle"
@@ -62,12 +62,12 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel=","
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="20.400%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="."
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyStyle="num4KeyStyle"
@@ -87,12 +87,12 @@
the touch event on the area, "(" is intentionally not marked as a left edge key. -->
<Key
latin:keyLabel="("
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="20.400%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel=")"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyStyle="num7KeyStyle"
@@ -124,7 +124,7 @@
latin:keyStyle="num0KeyStyle" />
<Key
latin:keyLabel="#"
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<switch>
<case
latin:voiceKeyEnabled="true"
diff --git a/java/res/xml-sw768dp/kbd_phone_symbols.xml b/java/res/xml-sw768dp/kbd_phone_symbols.xml
index 22f78b6d340361ed98afbf4a6e6cd9e52480b352..6ee57d6a5c6cca6939a4fe887c9ed6c5bd4a5d68 100644
--- a/java/res/xml-sw768dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw768dp/kbd_phone_symbols.xml
@@ -35,12 +35,12 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="-"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="13.829%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="+"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:code="44"
@@ -66,12 +66,12 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel=","
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="13.829%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="."
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:code="59"
@@ -95,16 +95,16 @@
the touch event on the area, "(" is intentionally not marked as a left edge key. -->
<Key
latin:keyLabel="("
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyXPos="13.829%p"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel=")"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyLabel="N"
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyWidth="8.047%p" />
<Key
latin:keyStyle="num7KeyStyle"
@@ -136,7 +136,7 @@
latin:keyStyle="num0KeyStyle" />
<Key
latin:keyLabel="#"
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<switch>
<case
latin:voiceKeyEnabled="true"
diff --git a/java/res/xml-sw768dp/kbd_qwerty_row4.xml b/java/res/xml-sw768dp/kbd_qwerty_row4.xml
index 00eabab9e2375ba002b9cb0935b70df08bd7c706..bdef89dcc73805015ecf9a04289e50513ead9edc 100644
--- a/java/res/xml-sw768dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw768dp/kbd_qwerty_row4.xml
@@ -59,7 +59,7 @@
<Key
latin:keyLabel=":"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="+"
+ latin:keyHintLabel="+"
latin:popupCharacters="+" />
</case>
<default>
@@ -78,7 +78,7 @@
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\@"
+ latin:keyHintLabel="\@"
latin:popupCharacters="\@" />
</default>
</switch>
@@ -101,14 +101,14 @@
<Key
latin:keyLabel="/"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter=":"
+ latin:keyHintLabel=":"
latin:popupCharacters=":" />
</case>
<default>
<Key
latin:keyLabel="\'"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="""
+ latin:keyHintLabel="""
latin:popupCharacters=""" />
</default>
</switch>
@@ -123,7 +123,7 @@
<Key
latin:keyLabel="-"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="_"
+ latin:keyHintLabel="_"
latin:popupCharacters="_" />
</default>
</switch>
diff --git a/java/res/xml-sw768dp/kbd_row3_right2.xml b/java/res/xml-sw768dp/kbd_row3_right2.xml
index e90de8eec92cfc55dff94f20fa2b4e6a73561d2f..25453160f19bb80975aefaf41cb8681db7818ab1 100644
--- a/java/res/xml-sw768dp/kbd_row3_right2.xml
+++ b/java/res/xml-sw768dp/kbd_row3_right2.xml
@@ -34,12 +34,12 @@
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="!"
+ latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\?"
+ latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-sw768dp/kbd_rows_azerty.xml b/java/res/xml-sw768dp/kbd_rows_azerty.xml
index 3bcba0042bb3ee3b7dab42609b0f044da869a740..373bda9ce0c2a136da70c511c2975de08c98eda1 100644
--- a/java/res/xml-sw768dp/kbd_rows_azerty.xml
+++ b/java/res/xml-sw768dp/kbd_rows_azerty.xml
@@ -134,7 +134,7 @@
<Key
latin:keyLabel="\'"
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter=":"
+ latin:keyHintLabel=":"
latin:popupCharacters=":" />
<switch>
<case
@@ -149,12 +149,12 @@
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="!"
+ latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\?"
+ latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml-sw768dp/kbd_rows_qwertz.xml b/java/res/xml-sw768dp/kbd_rows_qwertz.xml
index 8d5f1e6d415767a4e445974e5ff28eaf35d1cc2d..6567c31662d888874183af18cc3635ea74fbb1de 100644
--- a/java/res/xml-sw768dp/kbd_rows_qwertz.xml
+++ b/java/res/xml-sw768dp/kbd_rows_qwertz.xml
@@ -107,12 +107,12 @@
<Key
latin:keyLabel=","
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="!"
+ latin:keyHintLabel="!"
latin:popupCharacters="!" />
<Key
latin:keyLabel="."
latin:keyLabelOption="hasUppercaseLetter"
- latin:keyHintLetter="\?"
+ latin:keyHintLabel="\?"
latin:popupCharacters="\?" />
</default>
</switch>
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index 63d519c4c3581efbfe4f494f0100c23ce590fcb1..3d86003919148a45264e6a0158c1dcbe9a35e9b3 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -46,7 +46,7 @@
<default>
<key-style
latin:styleName="settingsPopupStyle"
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="\@icon/5|\@integer/key_settings"
latin:parentStyle="functionalKeyStyle" />
</default>
@@ -129,7 +129,7 @@
latin:styleName="smileyKeyStyle"
latin:keyLabel=":-)"
latin:keyOutputText=":-) "
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_smiley"
latin:maxPopupKeyboardColumn="5"
latin:parentStyle="functionalKeyStyle" />
diff --git a/java/res/xml/kbd_number.xml b/java/res/xml/kbd_number.xml
index 429b818460ac5e885a26ee33bcc29e390eba5461..4d7b6d9a9ffd1619cb31119716d7c919c31af2b3 100644
--- a/java/res/xml/kbd_number.xml
+++ b/java/res/xml/kbd_number.xml
@@ -83,39 +83,48 @@
>
<Key
latin:keyLabel="1"
+ latin:keyStyle="numKeyStyle"
latin:keyEdgeFlags="left" />
<Key
- latin:keyLabel="2" />
+ latin:keyLabel="2"
+ latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="3" />
+ latin:keyLabel="3"
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyLabel="-"
- latin:keyStyle="functionalKeyStyle"
+ latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
latin:keyLabel="4"
+ latin:keyStyle="numKeyStyle"
latin:keyEdgeFlags="left" />
<Key
- latin:keyLabel="5" />
+ latin:keyLabel="5"
+ latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="6" />
+ latin:keyLabel="6"
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyLabel=","
- latin:keyStyle="functionalKeyStyle"
+ latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
latin:keyLabel="7"
+ latin:keyStyle="numKeyStyle"
latin:keyEdgeFlags="left" />
<Key
- latin:keyLabel="8" />
+ latin:keyLabel="8"
+ latin:keyStyle="numKeyStyle"/>
<Key
- latin:keyLabel="9" />
+ latin:keyLabel="9"
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
@@ -128,9 +137,11 @@
latin:keyStyle="numSpaceKeyStyle"
latin:keyEdgeFlags="left" />
<Key
- latin:keyLabel="0" />
+ latin:keyLabel="0"
+ latin:keyStyle="numKeyStyle" />
<Key
- latin:keyLabel="." />
+ latin:keyLabel="."
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="returnKeyStyle"
latin:keyWidth="fillRight"
diff --git a/java/res/xml/kbd_numkey_styles.xml b/java/res/xml/kbd_numkey_styles.xml
index 3a26a022b52b6155dea94017823403e5904cda87..657bfbcbf47fc2bee417b607ac53f2a6915455ca 100644
--- a/java/res/xml/kbd_numkey_styles.xml
+++ b/java/res/xml/kbd_numkey_styles.xml
@@ -21,72 +21,84 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
+ <key-style
+ latin:styleName="numKeyStyle"
+ latin:keyLabelOption="largeLetter|followKeyLetterRatio" />
+ <key-style
+ latin:styleName="numModeKeyStyle"
+ latin:keyLabelOption="fontNormal|followKeyLetterRatio" />
+ <key-style
+ latin:styleName="numFunctionalKeyStyle"
+ latin:keyLabelOption="largeLetter|followKeyLetterRatio"
+ latin:parentStyle="functionalKeyStyle" />
+ <key-style
+ latin:styleName="numberKeyStyle"
+ latin:keyLabelOption="alignLeftOfCenter|hasHintLabel"
+ latin:parentStyle="numKeyStyle" />
<key-style
latin:styleName="num0KeyStyle"
latin:code="48"
- latin:keyIcon="iconNum0Key" />
+ latin:keyLabel="0 +"
+ latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num1KeyStyle"
- latin:code="49"
- latin:keyIcon="iconNum1Key" />
+ latin:keyLabel="1"
+ latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num2KeyStyle"
- latin:code="50"
- latin:keyIcon="iconNum2Key" />
+ latin:keyLabel="2"
+ latin:keyHintLabel="ABC"
+ latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num3KeyStyle"
- latin:code="51"
- latin:keyIcon="iconNum3Key" />
+ latin:keyLabel="3"
+ latin:keyHintLabel="DEF"
+ latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num4KeyStyle"
- latin:code="52"
- latin:keyIcon="iconNum4Key" />
+ latin:keyLabel="4"
+ latin:keyHintLabel="GHI"
+ latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num5KeyStyle"
- latin:code="53"
- latin:keyIcon="iconNum5Key" />
+ latin:keyLabel="5"
+ latin:keyHintLabel="JKL"
+ latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num6KeyStyle"
- latin:code="54"
- latin:keyIcon="iconNum6Key" />
+ latin:keyLabel="6"
+ latin:keyHintLabel="MNO"
+ latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num7KeyStyle"
- latin:code="55"
- latin:keyIcon="iconNum7Key" />
+ latin:keyLabel="7"
+ latin:keyHintLabel="PQRS"
+ latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num8KeyStyle"
- latin:code="56"
- latin:keyIcon="iconNum8Key" />
+ latin:keyLabel="8"
+ latin:keyHintLabel="TUV"
+ latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="num9KeyStyle"
- latin:code="57"
- latin:keyIcon="iconNum9Key" />
- <key-style
- latin:styleName="numLabelStyle"
- latin:keyLabelOption="fontFixedWidth|followKeyLetterRatio" />
- <key-style
- latin:styleName="numLabelFunctionalStyle"
- latin:keyLabelOption="fontFixedWidth|followKeyLetterRatio"
- latin:parentStyle="functionalKeyStyle" />
+ latin:keyLabel="9"
+ latin:keyHintLabel="WXYZ"
+ latin:parentStyle="numberKeyStyle" />
<key-style
latin:styleName="numStarKeyStyle"
latin:code="42"
latin:keyLabel="\uff0a"
- latin:parentStyle="numLabelStyle" />
- <key-style
- latin:styleName="numPoundKeyStyle"
- latin:keyLabel="#"
- latin:parentStyle="numLabelStyle" />
+ latin:parentStyle="numKeyStyle" />
<key-style
latin:styleName="numSwitchToAltKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_phone_symbols_key"
- latin:parentStyle="numLabelStyle" />
+ latin:parentStyle="numModeKeyStyle" />
<key-style
latin:styleName="numSwitchToNumericKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_phone_numeric_key"
- latin:parentStyle="numLabelStyle" />
+ latin:parentStyle="numModeKeyStyle" />
<key-style
latin:styleName="numSpaceKeyStyle"
latin:code="@integer/key_space"
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index 794528c2b5b5f62e147013d280094255635c81c1..c6508fb034867aee2564f713abe33d4247376f1d 100644
--- a/java/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
@@ -38,7 +38,7 @@
latin:keyStyle="num3KeyStyle" />
<Key
latin:keyLabel="-"
- latin:keyStyle="numLabelFunctionalStyle"
+ latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
</Row>
@@ -52,7 +52,7 @@
latin:keyStyle="num6KeyStyle" />
<Key
latin:keyLabel="."
- latin:keyStyle="numLabelFunctionalStyle"
+ latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
</Row>
diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml
index 1405c3c214f2f2845fc9c5d938cc3ee4edddcbab..5d99122297eea8477795ebab13396057b6d07f4b 100644
--- a/java/res/xml/kbd_phone_symbols.xml
+++ b/java/res/xml/kbd_phone_symbols.xml
@@ -31,36 +31,36 @@
>
<Key
latin:keyLabel="("
- latin:keyStyle="numLabelStyle"
+ latin:keyStyle="numKeyStyle"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="/"
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyLabel=")"
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyLabel="-"
- latin:keyStyle="numLabelFunctionalStyle"
+ latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
</Row>
<Row>
<Key
latin:keyLabel="N"
- latin:keyStyle="numLabelStyle"
latin:keyEdgeFlags="left" />
<!-- Pause is a comma. Check PhoneNumberUtils.java to see if this
has changed. -->
<Key
latin:code="44"
- latin:keyLabel="Pause" />
+ latin:keyLabel="@string/label_pause_key"
+ latin:keyLabelOption="followKeyHintLabelRatio" />
<Key
latin:keyLabel=","
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyLabel="."
- latin:keyStyle="numLabelFunctionalStyle"
+ latin:keyStyle="numFunctionalKeyStyle"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
</Row>
@@ -71,10 +71,11 @@
<!-- Wait is a semicolon. -->
<Key
latin:code="59"
- latin:keyLabel="Wait" />
+ latin:keyLabel="@string/label_wait_key"
+ latin:keyLabelOption="followKeyHintLabelRatio" />
<Key
latin:keyLabel="#"
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight"
@@ -88,7 +89,7 @@
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="+"
- latin:keyStyle="numLabelStyle" />
+ latin:keyStyle="numKeyStyle" />
<Key
latin:keyStyle="numSpaceKeyStyle" />
<Key
diff --git a/java/res/xml/kbd_qwerty_row1.xml b/java/res/xml/kbd_qwerty_row1.xml
index 8c3669de0448e886a73058d0ac91e4630dc7c476..cfd2efd2a555ecc540e78322504f615b4933c156 100644
--- a/java/res/xml/kbd_qwerty_row1.xml
+++ b/java/res/xml/kbd_qwerty_row1.xml
@@ -27,44 +27,44 @@
>
<Key
latin:keyLabel="q"
- latin:keyHintLetter="1"
+ latin:keyHintLabel="1"
latin:popupCharacters="@string/alternates_for_q"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="w"
- latin:keyHintLetter="2"
+ latin:keyHintLabel="2"
latin:popupCharacters="@string/alternates_for_w" />
<Key
latin:keyLabel="e"
- latin:keyHintLetter="3"
+ latin:keyHintLabel="3"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
- latin:keyHintLetter="4"
+ latin:keyHintLabel="4"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
- latin:keyHintLetter="5"
+ latin:keyHintLabel="5"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="y"
- latin:keyHintLetter="6"
+ latin:keyHintLabel="6"
latin:popupCharacters="@string/alternates_for_y" />
<Key
latin:keyLabel="u"
- latin:keyHintLetter="7"
+ latin:keyHintLabel="7"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
- latin:keyHintLetter="8"
+ latin:keyHintLabel="8"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
- latin:keyHintLetter="9"
+ latin:keyHintLabel="9"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
- latin:keyHintLetter="0"
+ latin:keyHintLabel="0"
latin:popupCharacters="@string/alternates_for_p"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
diff --git a/java/res/xml/kbd_qwerty_row4.xml b/java/res/xml/kbd_qwerty_row4.xml
index 0951339296c690d9d2c9c93c84cde8d623bf0ae7..ff2ef3acd0e4ce00cca06f8250e245b3b676186e 100644
--- a/java/res/xml/kbd_qwerty_row4.xml
+++ b/java/res/xml/kbd_qwerty_row4.xml
@@ -47,7 +47,7 @@
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_web_tab_punctuation"
latin:keyWidth="9.2%p"
latin:maxPopupKeyboardColumn="8" />
@@ -55,7 +55,7 @@
<default>
<Key
latin:keyLabel="."
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:keyWidth="9.2%p"
latin:maxPopupKeyboardColumn="7"
@@ -80,14 +80,14 @@
>
<Key
latin:keyStyle="tabKeyStyle"
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_web_tab_punctuation"
latin:maxPopupKeyboardColumn="8" />
</case>
<default>
<Key
latin:keyLabel="."
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
diff --git a/java/res/xml/kbd_rows_azerty.xml b/java/res/xml/kbd_rows_azerty.xml
index 9825c4a103648de3c01ffefd75ec5b4ab81a5a37..96efb66461f5232c9dc981a36a8a1fb7d0601aee 100644
--- a/java/res/xml/kbd_rows_azerty.xml
+++ b/java/res/xml/kbd_rows_azerty.xml
@@ -29,44 +29,44 @@
>
<Key
latin:keyLabel="a"
- latin:keyHintLetter="1"
+ latin:keyHintLabel="1"
latin:popupCharacters="@string/alternates_for_a"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="z"
- latin:keyHintLetter="2"
+ latin:keyHintLabel="2"
latin:popupCharacters="@string/alternates_for_z" />
<Key
latin:keyLabel="e"
- latin:keyHintLetter="3"
+ latin:keyHintLabel="3"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
- latin:keyHintLetter="4"
+ latin:keyHintLabel="4"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
- latin:keyHintLetter="5"
+ latin:keyHintLabel="5"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="y"
- latin:keyHintLetter="6"
+ latin:keyHintLabel="6"
latin:popupCharacters="@string/alternates_for_y" />
<Key
latin:keyLabel="u"
- latin:keyHintLetter="7"
+ latin:keyHintLabel="7"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
- latin:keyHintLetter="8"
+ latin:keyHintLabel="8"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
- latin:keyHintLetter="9"
+ latin:keyHintLabel="9"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
- latin:keyHintLetter="0"
+ latin:keyHintLabel="0"
latin:popupCharacters="@string/alternates_for_p"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
diff --git a/java/res/xml/kbd_rows_qwertz.xml b/java/res/xml/kbd_rows_qwertz.xml
index 0d70b2637cbc41beb4acad06ac310f5bd7626647..347ef60ad695f640502d1005e7511b7a346121de 100644
--- a/java/res/xml/kbd_rows_qwertz.xml
+++ b/java/res/xml/kbd_rows_qwertz.xml
@@ -29,44 +29,44 @@
>
<Key
latin:keyLabel="q"
- latin:keyHintLetter="1"
+ latin:keyHintLabel="1"
latin:popupCharacters="@string/alternates_for_q"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="w"
- latin:keyHintLetter="2"
+ latin:keyHintLabel="2"
latin:popupCharacters="@string/alternates_for_w" />
<Key
latin:keyLabel="e"
- latin:keyHintLetter="3"
+ latin:keyHintLabel="3"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
- latin:keyHintLetter="4"
+ latin:keyHintLabel="4"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
- latin:keyHintLetter="5"
+ latin:keyHintLabel="5"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="z"
- latin:keyHintLetter="6"
+ latin:keyHintLabel="6"
latin:popupCharacters="@string/alternates_for_z" />
<Key
latin:keyLabel="u"
- latin:keyHintLetter="7"
+ latin:keyHintLabel="7"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
- latin:keyHintLetter="8"
+ latin:keyHintLabel="8"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
- latin:keyHintLetter="9"
+ latin:keyHintLabel="9"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
- latin:keyHintLetter="0"
+ latin:keyHintLabel="0"
latin:popupCharacters="@string/alternates_for_p"
latin:keyWidth="fillRight"
latin:keyEdgeFlags="right" />
diff --git a/java/res/xml/kbd_rows_russian.xml b/java/res/xml/kbd_rows_russian.xml
index ff9fef4099bb0c802acd98d6e1e6c818eddc6b46..2c10c314189215d400fcafbf9de3ddbc4d4f41df 100644
--- a/java/res/xml/kbd_rows_russian.xml
+++ b/java/res/xml/kbd_rows_russian.xml
@@ -29,45 +29,45 @@
>
<Key
latin:keyLabel="й"
- latin:keyHintLetter="1"
+ latin:keyHintLabel="1"
latin:popupCharacters="1"
latin:keyWidth="8.75%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="ц"
- latin:keyHintLetter="2"
+ latin:keyHintLabel="2"
latin:popupCharacters="2" />
<Key
latin:keyLabel="у"
- latin:keyHintLetter="3"
+ latin:keyHintLabel="3"
latin:popupCharacters="3" />
<Key
latin:keyLabel="к"
- latin:keyHintLetter="4"
+ latin:keyHintLabel="4"
latin:popupCharacters="4" />
<Key
latin:keyLabel="е"
- latin:keyHintLetter="5"
+ latin:keyHintLabel="5"
latin:popupCharacters="@string/alternates_for_cyrillic_e" />
<Key
latin:keyLabel="н"
- latin:keyHintLetter="6"
+ latin:keyHintLabel="6"
latin:popupCharacters="6" />
<Key
latin:keyLabel="г"
- latin:keyHintLetter="7"
+ latin:keyHintLabel="7"
latin:popupCharacters="7" />
<Key
latin:keyLabel="ш"
- latin:keyHintLetter="8"
+ latin:keyHintLabel="8"
latin:popupCharacters="8" />
<Key
latin:keyLabel="щ"
- latin:keyHintLetter="9"
+ latin:keyHintLabel="9"
latin:popupCharacters="9" />
<Key
latin:keyLabel="з"
- latin:keyHintLetter="0"
+ latin:keyHintLabel="0"
latin:popupCharacters="0" />
<Key
latin:keyLabel="Ñ…"
diff --git a/java/res/xml/kbd_rows_scandinavian.xml b/java/res/xml/kbd_rows_scandinavian.xml
index 2d7dcde7a28e7df616f1e09de0e6616b3f2744b6..3f2560128f85ebaa4c9545a6775c2f0e6da1d8d1 100644
--- a/java/res/xml/kbd_rows_scandinavian.xml
+++ b/java/res/xml/kbd_rows_scandinavian.xml
@@ -29,45 +29,45 @@
>
<Key
latin:keyLabel="q"
- latin:keyHintLetter="1"
+ latin:keyHintLabel="1"
latin:popupCharacters="@string/alternates_for_q"
latin:keyWidth="8.75%p"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="w"
- latin:keyHintLetter="2"
+ latin:keyHintLabel="2"
latin:popupCharacters="@string/alternates_for_w" />
<Key
latin:keyLabel="e"
- latin:keyHintLetter="3"
+ latin:keyHintLabel="3"
latin:popupCharacters="@string/alternates_for_e" />
<Key
latin:keyLabel="r"
- latin:keyHintLetter="4"
+ latin:keyHintLabel="4"
latin:popupCharacters="@string/alternates_for_r" />
<Key
latin:keyLabel="t"
- latin:keyHintLetter="5"
+ latin:keyHintLabel="5"
latin:popupCharacters="@string/alternates_for_t" />
<Key
latin:keyLabel="y"
- latin:keyHintLetter="6"
+ latin:keyHintLabel="6"
latin:popupCharacters="@string/alternates_for_y" />
<Key
latin:keyLabel="u"
- latin:keyHintLetter="7"
+ latin:keyHintLabel="7"
latin:popupCharacters="@string/alternates_for_u" />
<Key
latin:keyLabel="i"
- latin:keyHintLetter="8"
+ latin:keyHintLabel="8"
latin:popupCharacters="@string/alternates_for_i" />
<Key
latin:keyLabel="o"
- latin:keyHintLetter="9"
+ latin:keyHintLabel="9"
latin:popupCharacters="@string/alternates_for_o" />
<Key
latin:keyLabel="p"
- latin:keyHintLetter="0"
+ latin:keyHintLabel="0"
latin:popupCharacters="@string/alternates_for_p" />
<Key
latin:keyLabel="Ã¥"
diff --git a/java/res/xml/kbd_rows_serbian.xml b/java/res/xml/kbd_rows_serbian.xml
index 9f4b6a203127ef4ef668462aef167f8903ac31e4..2bed276d32bd1f131cec9c1a679f9147b1ffd10f 100644
--- a/java/res/xml/kbd_rows_serbian.xml
+++ b/java/res/xml/kbd_rows_serbian.xml
@@ -29,44 +29,44 @@
>
<Key
latin:keyLabel="Ñ™"
- latin:keyHintLetter="1"
+ latin:keyHintLabel="1"
latin:popupCharacters="1"
latin:keyEdgeFlags="left" />
<Key
latin:keyLabel="Ñš"
- latin:keyHintLetter="2"
+ latin:keyHintLabel="2"
latin:popupCharacters="2" />
<Key
latin:keyLabel="е"
- latin:keyHintLetter="3"
+ latin:keyHintLabel="3"
latin:popupCharacters="3" />
<Key
latin:keyLabel="Ñ€"
- latin:keyHintLetter="4"
+ latin:keyHintLabel="4"
latin:popupCharacters="4" />
<Key
latin:keyLabel="Ñ‚"
- latin:keyHintLetter="5"
+ latin:keyHintLabel="5"
latin:popupCharacters="5" />
<Key
latin:keyLabel="з"
- latin:keyHintLetter="6"
+ latin:keyHintLabel="6"
latin:popupCharacters="6" />
<Key
latin:keyLabel="у"
- latin:keyHintLetter="7"
+ latin:keyHintLabel="7"
latin:popupCharacters="7" />
<Key
latin:keyLabel="и"
- latin:keyHintLetter="8"
+ latin:keyHintLabel="8"
latin:popupCharacters="8" />
<Key
latin:keyLabel="о"
- latin:keyHintLetter="9"
+ latin:keyHintLabel="9"
latin:popupCharacters="9" />
<Key
latin:keyLabel="п"
- latin:keyHintLetter="0"
+ latin:keyHintLabel="0"
latin:popupCharacters="0" />
<Key
latin:keyLabel="ш"
diff --git a/java/res/xml/kbd_symbols_row4.xml b/java/res/xml/kbd_symbols_row4.xml
index 9323d4fd117b9ccbf89bc27d1d11a4af2bf66ad9..68b79e84d02c60d0d22854f1d7747dbc0c2e187e 100644
--- a/java/res/xml/kbd_symbols_row4.xml
+++ b/java/res/xml/kbd_symbols_row4.xml
@@ -43,7 +43,7 @@
latin:keyWidth="35.83%p" />
<Key
latin:keyLabel="."
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:keyWidth="9.2%p"
latin:maxPopupKeyboardColumn="7"
@@ -62,7 +62,7 @@
latin:keyWidth="50%p" />
<Key
latin:keyLabel="."
- latin:keyLabelOption="popupHint"
+ latin:keyLabelOption="hasPopupHint"
latin:popupCharacters="@string/alternates_for_punctuation"
latin:maxPopupKeyboardColumn="7"
latin:keyStyle="functionalKeyStyle" />
diff --git a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
index 154f4af911becd3036bc2ec98541190f7b4b6638..a31911d60ca3aa2706bb984a30f6a0bbe58104e4 100644
--- a/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
+++ b/java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java
@@ -134,7 +134,7 @@ public class KeyCodeDescriptionMapper {
return context.getString(mKeyLabelMap.get(label));
} else if (label.length() == 1
|| (keyboard.isManualTemporaryUpperCase() && !TextUtils
- .isEmpty(key.mHintLetter))) {
+ .isEmpty(key.mHintLabel))) {
return getDescriptionForKeyCode(context, keyboard, key);
} else {
return label;
@@ -181,8 +181,8 @@ public class KeyCodeDescriptionMapper {
* @return the key code for the specified key
*/
private int getCorrectKeyCode(Keyboard keyboard, Key key) {
- if (keyboard.isManualTemporaryUpperCase() && !TextUtils.isEmpty(key.mHintLetter)) {
- return key.mHintLetter.charAt(0);
+ if (keyboard.isManualTemporaryUpperCase() && !TextUtils.isEmpty(key.mHintLabel)) {
+ return key.mHintLabel.charAt(0);
} else {
return key.mCode;
}
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index 2850c95dfce6ff8c34792fa8180083510c9ae0e6..872fbf823b83f1b05ac9f0f4c4d7b43a7776ab38 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -19,17 +19,18 @@ package com.android.inputmethod.keyboard;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.content.res.XmlResourceParser;
+import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.util.Xml;
import com.android.inputmethod.keyboard.internal.KeyStyles;
+import com.android.inputmethod.keyboard.internal.KeyStyles.KeyStyle;
import com.android.inputmethod.keyboard.internal.KeyboardIconsSet;
import com.android.inputmethod.keyboard.internal.KeyboardParser;
+import com.android.inputmethod.keyboard.internal.KeyboardParser.ParseException;
import com.android.inputmethod.keyboard.internal.PopupCharactersParser;
import com.android.inputmethod.keyboard.internal.Row;
-import com.android.inputmethod.keyboard.internal.KeyStyles.KeyStyle;
-import com.android.inputmethod.keyboard.internal.KeyboardParser.ParseException;
import com.android.inputmethod.latin.R;
import java.util.ArrayList;
@@ -45,18 +46,22 @@ public class Key {
/** Label to display */
public final CharSequence mLabel;
- /** Hint letter to display on the key in conjunction with the label */
- public final CharSequence mHintLetter;
+ /** Hint label to display on the key in conjunction with the label */
+ public final CharSequence mHintLabel;
/** Option of the label */
public final int mLabelOption;
public static final int LABEL_OPTION_ALIGN_LEFT = 0x01;
public static final int LABEL_OPTION_ALIGN_RIGHT = 0x02;
- public static final int LABEL_OPTION_ALIGN_BOTTOM = 0x08;
- public static final int LABEL_OPTION_FONT_NORMAL = 0x10;
- public static final int LABEL_OPTION_FONT_FIXED_WIDTH = 0x20;
- public static final int LABEL_OPTION_FOLLOW_KEY_LETTER_RATIO = 0x40;
- private static final int LABEL_OPTION_POPUP_HINT = 0x80;
- private static final int LABEL_OPTION_HAS_UPPERCASE_LETTER = 0x100;
+ public static final int LABEL_OPTION_ALIGN_BOTTOM = 0x04;
+ public static final int LABEL_OPTION_ALIGN_LEFT_OF_CENTER = 0x08;
+ private static final int LABEL_OPTION_LARGE_LETTER = 0x10;
+ private static final int LABEL_OPTION_FONT_NORMAL = 0x20;
+ private static final int LABEL_OPTION_FONT_MONO_SPACE = 0x40;
+ private static final int LABEL_OPTION_FOLLOW_KEY_LETTER_RATIO = 0x80;
+ private static final int LABEL_OPTION_FOLLOW_KEY_HINT_LABEL_RATIO = 0x100;
+ private static final int LABEL_OPTION_HAS_POPUP_HINT = 0x200;
+ private static final int LABEL_OPTION_HAS_UPPERCASE_LETTER = 0x400;
+ private static final int LABEL_OPTION_HAS_HINT_LABEL = 0x800;
/** Icon to display instead of a label. Icon takes precedence over a label */
private Drawable mIcon;
@@ -160,7 +165,7 @@ public class Key {
mVisualInsetsLeft = mVisualInsetsRight = 0;
mWidth = width - mGap;
mEdgeFlags = edgeFlags;
- mHintLetter = null;
+ mHintLabel = null;
mLabelOption = 0;
mFunctional = false;
mSticky = false;
@@ -282,7 +287,7 @@ public class Key {
keyAttr, R.styleable.Keyboard_Key_keyIcon,
KeyboardIconsSet.ICON_UNDEFINED));
Keyboard.setDefaultBounds(mIcon);
- mHintLetter = style.getText(keyAttr, R.styleable.Keyboard_Key_keyHintLetter);
+ mHintLabel = style.getText(keyAttr, R.styleable.Keyboard_Key_keyHintLabel);
mLabel = style.getText(keyAttr, R.styleable.Keyboard_Key_keyLabel);
mLabelOption = style.getFlag(keyAttr, R.styleable.Keyboard_Key_keyLabelOption, 0);
@@ -309,14 +314,43 @@ public class Key {
}
}
+ public Typeface selectTypeface(Typeface defaultTypeface) {
+ // TODO: Handle "bold" here too?
+ if ((mLabelOption & LABEL_OPTION_FONT_NORMAL) != 0) {
+ return Typeface.DEFAULT;
+ } else if ((mLabelOption & LABEL_OPTION_FONT_MONO_SPACE) != 0) {
+ return Typeface.MONOSPACE;
+ } else {
+ return defaultTypeface;
+ }
+ }
+
+ public int selectTextSize(int letter, int largeLetter, int label, int hintLabel) {
+ if (mLabel.length() > 1
+ && (mLabelOption & (LABEL_OPTION_FOLLOW_KEY_LETTER_RATIO
+ | LABEL_OPTION_FOLLOW_KEY_HINT_LABEL_RATIO)) == 0) {
+ return label;
+ } else if ((mLabelOption & LABEL_OPTION_FOLLOW_KEY_HINT_LABEL_RATIO) != 0) {
+ return hintLabel;
+ } else if ((mLabelOption & LABEL_OPTION_LARGE_LETTER) != 0) {
+ return largeLetter;
+ } else {
+ return letter;
+ }
+ }
+
public boolean hasPopupHint() {
- return (mLabelOption & LABEL_OPTION_POPUP_HINT) != 0;
+ return (mLabelOption & LABEL_OPTION_HAS_POPUP_HINT) != 0;
}
public boolean hasUppercaseLetter() {
return (mLabelOption & LABEL_OPTION_HAS_UPPERCASE_LETTER) != 0;
}
+ public boolean hasHintLabel() {
+ return (mLabelOption & LABEL_OPTION_HAS_HINT_LABEL) != 0;
+ }
+
private static boolean isDigitPopupCharacter(CharSequence label) {
return label != null && label.length() == 1 && Character.isDigit(label.charAt(0));
}
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 6a60a9ddf633658481a56a31936aedd869d4e93e..8ca6ade6c2394b99160535594bbe88fc3686c118 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -66,16 +66,20 @@ import java.util.WeakHashMap;
* @attr ref R.styleable#KeyboardView_keyBackground
* @attr ref R.styleable#KeyboardView_keyHysteresisDistance
* @attr ref R.styleable#KeyboardView_keyLetterRatio
+ * @attr ref R.styleable#KeyboardView_keyLargeLetterRatio
* @attr ref R.styleable#KeyboardView_keyLabelRatio
* @attr ref R.styleable#KeyboardView_keyHintLetterRatio
* @attr ref R.styleable#KeyboardView_keyUppercaseLetterRatio
+ * @attr ref R.styleable#KeyboardView_keyHintLabelRatio
* @attr ref R.styleable#KeyboardView_keyTextStyle
* @attr ref R.styleable#KeyboardView_keyPreviewLayout
+ * @attr ref R.styleable#KeyboardView_keyPreviewTextRatio
* @attr ref R.styleable#KeyboardView_keyPreviewOffset
* @attr ref R.styleable#KeyboardView_keyPreviewHeight
* @attr ref R.styleable#KeyboardView_keyTextColor
* @attr ref R.styleable#KeyboardView_keyTextColorDisabled
* @attr ref R.styleable#KeyboardView_keyHintLetterColor
+ * @attr ref R.styleable#KeyboardView_keyHintLabelColor
* @attr ref R.styleable#KeyboardView_keyUppercaseLetterInactivatedColor
* @attr ref R.styleable#KeyboardView_keyUppercaseLetterActivatedColor
* @attr ref R.styleable#KeyboardView_verticalCorrection
@@ -99,13 +103,15 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
private static final int HINT_ICON_VERTICAL_ADJUSTMENT_PIXEL = -1;
// XML attribute
- private final float mKeyLetterRatio;
private final int mKeyTextColor;
private final int mKeyTextInactivatedColor;
private final Typeface mKeyTextStyle;
+ private final float mKeyLetterRatio;
+ private final float mKeyLargeLetterRatio;
private final float mKeyLabelRatio;
private final float mKeyHintLetterRatio;
private final float mKeyUppercaseLetterRatio;
+ private final float mKeyHintLabelRatio;
private final int mShadowColor;
private final float mShadowRadius;
private final Drawable mKeyBackground;
@@ -117,15 +123,18 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
private final int mPopupLayout;
private final Drawable mKeyPopupHintIcon;
private final int mKeyHintLetterColor;
+ private final int mKeyHintLabelColor;
private final int mKeyUppercaseLetterInactivatedColor;
private final int mKeyUppercaseLetterActivatedColor;
// Main keyboard
private Keyboard mKeyboard;
private int mKeyLetterSize;
+ private int mKeyLargeLetterSize;
private int mKeyLabelSize;
private int mKeyHintLetterSize;
private int mKeyUppercaseLetterSize;
+ private int mKeyHintLabelSize;
// Key preview
private boolean mInForeground;
@@ -182,7 +191,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
private Canvas mCanvas;
private final Paint mPaint = new Paint();
private final Rect mPadding = new Rect();
- private final Rect mTextBounds = new Rect();
// This map caches key label text height in pixel as value and key label text size as map key.
private final HashMap<Integer, Integer> mTextHeightCache = new HashMap<Integer, Integer>();
// This map caches key label text width in pixel as value and key label text size as map key.
@@ -338,15 +346,19 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
mPreviewOffset = a.getDimensionPixelOffset(R.styleable.KeyboardView_keyPreviewOffset, 0);
mPreviewHeight = a.getDimensionPixelSize(R.styleable.KeyboardView_keyPreviewHeight, 80);
mKeyLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLetterRatio);
+ mKeyLargeLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLargeLetterRatio);
mKeyLabelRatio = getRatio(a, R.styleable.KeyboardView_keyLabelRatio);
mKeyHintLetterRatio = getRatio(a, R.styleable.KeyboardView_keyHintLetterRatio);
mKeyUppercaseLetterRatio = getRatio(a,
R.styleable.KeyboardView_keyUppercaseLetterRatio);
+ mKeyHintLabelRatio = getRatio(a, R.styleable.KeyboardView_keyHintLabelRatio);
+ mPreviewTextRatio = getRatio(a, R.styleable.KeyboardView_keyPreviewTextRatio);
mKeyTextColor = a.getColor(R.styleable.KeyboardView_keyTextColor, 0xFF000000);
mKeyTextInactivatedColor = a.getColor(
R.styleable.KeyboardView_keyTextInactivatedColor, 0xFF000000);
mKeyPopupHintIcon = a.getDrawable(R.styleable.KeyboardView_keyPopupHintIcon);
mKeyHintLetterColor = a.getColor(R.styleable.KeyboardView_keyHintLetterColor, 0);
+ mKeyHintLabelColor = a.getColor(R.styleable.KeyboardView_keyHintLabelColor, 0);
mKeyUppercaseLetterInactivatedColor = a.getColor(
R.styleable.KeyboardView_keyUppercaseLetterInactivatedColor, 0);
mKeyUppercaseLetterActivatedColor = a.getColor(
@@ -365,7 +377,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
if (previewLayout != 0) {
mPreviewText = (TextView) LayoutInflater.from(context).inflate(previewLayout, null);
mPreviewBackground = mPreviewText.getBackground();
- mPreviewTextRatio = getRatio(res, R.fraction.key_preview_text_ratio);
} else {
mShowKeyPreviewPopup = false;
}
@@ -462,11 +473,6 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
return a.getFraction(index, 1000, 1000, 1) / 1000.0f;
}
- // Read fraction value in resource as float.
- private static float getRatio(Resources res, int id) {
- return res.getFraction(id, 1000, 1000) / 1000.0f;
- }
-
public void startIgnoringDoubleTap() {
if (ENABLE_CAPSLOCK_BY_DOUBLETAP)
mHandler.startIgnoringDoubleTap();
@@ -521,10 +527,12 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
mPopupPanelCache.clear();
final int keyHeight = keyboard.getRowHeight() - keyboard.getVerticalGap();
mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);
+ mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio);
mKeyLabelSize = (int)(keyHeight * mKeyLabelRatio);
mKeyHintLetterSize = (int)(keyHeight * mKeyHintLetterRatio);
mKeyUppercaseLetterSize = (int)(
keyHeight * mKeyUppercaseLetterRatio);
+ mKeyHintLabelSize = (int)(keyHeight * mKeyHintLabelRatio);
mPreviewTextSize = (int)(keyHeight * mPreviewTextRatio);
}
@@ -587,7 +595,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
protected CharSequence adjustCase(CharSequence label) {
if (mKeyboard.isShiftedOrShiftLocked() && label != null && label.length() < 3
&& Character.isLowerCase(label.charAt(0))) {
- return label.toString().toUpperCase();
+ return label.toString().toUpperCase(mKeyboard.mId.mLocale);
}
return label;
}
@@ -689,6 +697,8 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
final int kbdPaddingTop = getPaddingTop();
final int keyDrawX = key.mX + key.mVisualInsetsLeft;
final int keyDrawWidth = key.mWidth - key.mVisualInsetsLeft - key.mVisualInsetsRight;
+ final int centerX = (keyDrawWidth + padding.left - padding.right) / 2;
+ final float centerY = (key.mHeight + padding.top - padding.bottom) / 2;
final int rowHeight = padding.top + key.mHeight;
final boolean isManualTemporaryUpperCase = mKeyboard.isManualTemporaryUpperCase();
@@ -704,47 +714,48 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
keyBackground.draw(canvas);
// Draw key label.
+ int positionX = centerX;
if (key.mLabel != null) {
// Switch the character to uppercase if shift is pressed
- final String label = key.mLabel == null ? null : adjustCase(key.mLabel).toString();
- // For characters, use large font. For labels like "Done", use small font.
- final int labelSize = getLabelSizeAndSetPaint(label, key.mLabelOption, paint);
- final int labelCharHeight = getLabelCharHeight(labelSize, paint);
+ final CharSequence label = key.mLabel == null ? null : adjustCase(key.mLabel);
+ // For characters, use large font. For labels like "Done", use smaller font.
+ paint.setTypeface(key.selectTypeface(mKeyTextStyle));
+ final int labelSize = key.selectTextSize(mKeyLetterSize, mKeyLargeLetterSize,
+ mKeyLabelSize, mKeyHintLabelSize);
+ paint.setTextSize(labelSize);
+ final int labelCharHeight = getLabelCharHeight(paint);
+ final int labelCharWidth = getLabelCharWidth(paint);
// Vertical label text alignment.
final float baseline;
+ // TODO: Generalize the following calculations.
if ((key.mLabelOption & Key.LABEL_OPTION_ALIGN_BOTTOM) != 0) {
baseline = key.mHeight - labelCharHeight * KEY_LABEL_VERTICAL_PADDING_FACTOR;
- if (DEBUG_SHOW_ALIGN)
- drawHorizontalLine(canvas, (int)baseline, keyDrawWidth, 0xc0008000,
- new Paint());
} else { // Align center
- final float centerY = (key.mHeight + padding.top - padding.bottom) / 2;
baseline = centerY + labelCharHeight * KEY_LABEL_VERTICAL_ADJUSTMENT_FACTOR_CENTER;
- if (DEBUG_SHOW_ALIGN)
- drawHorizontalLine(canvas, (int)baseline, keyDrawWidth, 0xc0008000,
- new Paint());
}
+
// Horizontal label text alignment
- final int positionX;
if ((key.mLabelOption & Key.LABEL_OPTION_ALIGN_LEFT) != 0) {
- positionX = mKeyLabelHorizontalPadding + padding.left;
+ positionX = padding.left + mKeyLabelHorizontalPadding;
paint.setTextAlign(Align.LEFT);
- if (DEBUG_SHOW_ALIGN)
- drawVerticalLine(canvas, positionX, rowHeight, 0xc0800080, new Paint());
} else if ((key.mLabelOption & Key.LABEL_OPTION_ALIGN_RIGHT) != 0) {
positionX = keyDrawWidth - mKeyLabelHorizontalPadding - padding.right;
paint.setTextAlign(Align.RIGHT);
- if (DEBUG_SHOW_ALIGN)
- drawVerticalLine(canvas, positionX, rowHeight, 0xc0808000, new Paint());
+ } else if ((key.mLabelOption & Key.LABEL_OPTION_ALIGN_LEFT_OF_CENTER) != 0) {
+ // TODO: Parameterise this?
+ positionX = centerX - labelCharWidth * 7 / 4;
+ paint.setTextAlign(Align.LEFT);
} else {
- positionX = (keyDrawWidth + padding.left - padding.right) / 2;
+ positionX = centerX;
paint.setTextAlign(Align.CENTER);
- if (DEBUG_SHOW_ALIGN) {
- if (label.length() > 1)
- drawVerticalLine(canvas, positionX, rowHeight, 0xc0008080, new Paint());
- }
}
+ if (DEBUG_SHOW_ALIGN) {
+ final Paint line = new Paint();
+ drawHorizontalLine(canvas, (int)baseline, keyDrawWidth, 0xc0008000, line);
+ drawVerticalLine(canvas, positionX, rowHeight, 0xc0800080, line);
+ }
+
if (key.hasUppercaseLetter() && isManualTemporaryUpperCase) {
paint.setColor(mKeyTextInactivatedColor);
} else {
@@ -757,59 +768,67 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
// Make label invisible
paint.setColor(Color.TRANSPARENT);
}
- canvas.drawText(label, positionX, baseline, paint);
+ canvas.drawText(label, 0, label.length(), positionX, baseline, paint);
// Turn off drop shadow
paint.setShadowLayer(0, 0, 0, 0);
+
}
- // Draw hint letter.
- if (key.mHintLetter != null) {
- final String label = key.mHintLetter.toString();
- final int textColor;
- final int textSize;
+ // Draw hint label.
+ if (key.mHintLabel != null) {
+ final CharSequence hint = key.mHintLabel;
+ final int hintColor;
+ final int hintSize;
if (key.hasUppercaseLetter()) {
- textColor = isManualTemporaryUpperCase ? mKeyUppercaseLetterActivatedColor
+ hintColor = isManualTemporaryUpperCase ? mKeyUppercaseLetterActivatedColor
: mKeyUppercaseLetterInactivatedColor;
- textSize = mKeyUppercaseLetterSize;
+ hintSize = mKeyUppercaseLetterSize;
+ } else if (key.hasHintLabel()) {
+ hintColor = mKeyHintLabelColor;
+ hintSize = mKeyHintLabelSize;
+ paint.setTypeface(Typeface.DEFAULT);
} else {
- textColor = mKeyHintLetterColor;
- textSize = mKeyHintLetterSize;
+ hintColor = mKeyHintLetterColor;
+ hintSize = mKeyHintLetterSize;
}
- paint.setColor(textColor);
- paint.setTextSize(textSize);
+ paint.setColor(hintColor);
+ paint.setTextSize(hintSize);
// Note: padding.right for drawX?
- final float drawX = keyDrawWidth - getLabelCharWidth(textSize, paint);
- final float drawY = -paint.ascent() + padding.top;
- canvas.drawText(label, drawX, drawY, paint);
+ final float hintX, hintY;
+ if (key.hasHintLabel()) {
+ // TODO: Generalize the following calculations.
+ hintX = positionX + getLabelCharWidth(paint) * 2;
+ hintY = centerY + getLabelCharHeight(paint) / 2;
+ } else {
+ hintX = keyDrawWidth - getLabelCharWidth(paint);
+ hintY = -paint.ascent() + padding.top;
+ }
+ canvas.drawText(hint, 0, hint.length(), hintX, hintY, paint);
}
// Draw key icon.
final Drawable icon = key.getIcon();
if (key.mLabel == null && icon != null) {
- final int drawableWidth = icon.getIntrinsicWidth();
- final int drawableHeight = icon.getIntrinsicHeight();
- final int drawableX;
- final int drawableY = (key.mHeight + padding.top - padding.bottom - drawableHeight) / 2;
+ final int iconWidth = icon.getIntrinsicWidth();
+ final int iconHeight = icon.getIntrinsicHeight();
+ final int iconX, alignX;
+ final int iconY = (key.mHeight + padding.top - padding.bottom - iconHeight) / 2;
if ((key.mLabelOption & Key.LABEL_OPTION_ALIGN_LEFT) != 0) {
- drawableX = padding.left + mKeyLabelHorizontalPadding;
- if (DEBUG_SHOW_ALIGN)
- drawVerticalLine(canvas, drawableX, rowHeight, 0xc0800080, new Paint());
+ iconX = padding.left + mKeyLabelHorizontalPadding;
+ alignX = iconX;
} else if ((key.mLabelOption & Key.LABEL_OPTION_ALIGN_RIGHT) != 0) {
- drawableX = keyDrawWidth - padding.right - mKeyLabelHorizontalPadding
- - drawableWidth;
- if (DEBUG_SHOW_ALIGN)
- drawVerticalLine(canvas, drawableX + drawableWidth, rowHeight,
- 0xc0808000, new Paint());
+ iconX = keyDrawWidth - padding.right - mKeyLabelHorizontalPadding - iconWidth;
+ alignX = iconX + iconWidth;
} else { // Align center
- drawableX = (keyDrawWidth + padding.left - padding.right - drawableWidth) / 2;
- if (DEBUG_SHOW_ALIGN)
- drawVerticalLine(canvas, drawableX + drawableWidth / 2, rowHeight,
- 0xc0008080, new Paint());
+ iconX = (keyDrawWidth + padding.left - padding.right - iconWidth) / 2;
+ alignX = iconX + iconWidth / 2;
+ }
+ drawIcon(canvas, icon, iconX, iconY, iconWidth, iconHeight);
+ if (DEBUG_SHOW_ALIGN) {
+ final Paint line = new Paint();
+ drawVerticalLine(canvas, alignX, rowHeight, 0xc0800080, line);
+ drawRectangle(canvas, iconX, iconY, iconWidth, iconHeight, 0x80c00000, line);
}
- drawIcon(canvas, icon, drawableX, drawableY, drawableWidth, drawableHeight);
- if (DEBUG_SHOW_ALIGN)
- drawRectangle(canvas, drawableX, drawableY, drawableWidth, drawableHeight,
- 0x80c00000, new Paint());
}
// Draw popup hint icon "...".
@@ -821,60 +840,60 @@ public class KeyboardView extends View implements PointerTracker.UIProxy {
final int drawableY = HINT_ICON_VERTICAL_ADJUSTMENT_PIXEL;
final Drawable hintIcon = mKeyPopupHintIcon;
drawIcon(canvas, hintIcon, drawableX, drawableY, drawableWidth, drawableHeight);
- if (DEBUG_SHOW_ALIGN)
+ if (DEBUG_SHOW_ALIGN) {
drawRectangle(canvas, drawableX, drawableY, drawableWidth, drawableHeight,
0x80c0c000, new Paint());
+ }
}
canvas.translate(-keyDrawX - kbdPaddingLeft, -key.mY - kbdPaddingTop);
}
- public int getLabelSizeAndSetPaint(CharSequence label, int keyLabelOption, Paint paint) {
+ // This method is currently being used only by MiniKeyboardBuilder
+ public int getDefaultLabelSizeAndSetPaint(Paint paint) {
// For characters, use large font. For labels like "Done", use small font.
- final int labelSize;
- final Typeface labelStyle;
- if ((keyLabelOption & Key.LABEL_OPTION_FONT_NORMAL) != 0) {
- labelStyle = Typeface.DEFAULT;
- } else if ((keyLabelOption & Key.LABEL_OPTION_FONT_FIXED_WIDTH) != 0) {
- labelStyle = Typeface.MONOSPACE;
- } else {
- labelStyle = mKeyTextStyle;
- }
- if (label.length() > 1) {
- labelSize = (keyLabelOption & Key.LABEL_OPTION_FOLLOW_KEY_LETTER_RATIO) != 0
- ? mKeyLetterSize : mKeyLabelSize;
- } else {
- labelSize = mKeyLetterSize;
- }
+ final int labelSize = mKeyLabelSize;
paint.setTextSize(labelSize);
- paint.setTypeface(labelStyle);
+ paint.setTypeface(mKeyTextStyle);
return labelSize;
}
- private int getLabelCharHeight(int labelSize, Paint paint) {
- Integer labelHeightValue = mTextHeightCache.get(labelSize);
- final int labelCharHeight;
- if (labelHeightValue != null) {
- labelCharHeight = labelHeightValue;
- } else {
- paint.getTextBounds(KEY_LABEL_REFERENCE_CHAR, 0, 1, mTextBounds);
- labelCharHeight = mTextBounds.height();
- mTextHeightCache.put(labelSize, labelCharHeight);
- }
- return labelCharHeight;
+ private final Rect mTextBounds = new Rect();
+
+ private int getLabelCharHeight(Paint paint) {
+ final int labelSize = (int)paint.getTextSize();
+ final Integer cachedValue = mTextHeightCache.get(labelSize);
+ if (cachedValue != null)
+ return cachedValue;
+
+ paint.getTextBounds(KEY_LABEL_REFERENCE_CHAR, 0, 1, mTextBounds);
+ final int height = mTextBounds.height();
+ mTextHeightCache.put(labelSize, height);
+ return height;
}
- private int getLabelCharWidth(int labelSize, Paint paint) {
- Integer labelWidthValue = mTextWidthCache.get(labelSize);
- final int labelCharWidth;
- if (labelWidthValue != null) {
- labelCharWidth = labelWidthValue;
+ private int getLabelCharWidth(Paint paint) {
+ final int labelSize = (int)paint.getTextSize();
+ final Typeface face = paint.getTypeface();
+ final Integer key;
+ if (face == Typeface.DEFAULT) {
+ key = labelSize;
+ } else if (face == Typeface.DEFAULT_BOLD) {
+ key = labelSize + 1000;
+ } else if (face == Typeface.MONOSPACE) {
+ key = labelSize + 2000;
} else {
- paint.getTextBounds(KEY_LABEL_REFERENCE_CHAR, 0, 1, mTextBounds);
- labelCharWidth = mTextBounds.width();
- mTextWidthCache.put(labelSize, labelCharWidth);
+ key = labelSize;
}
- return labelCharWidth;
+
+ final Integer cached = mTextWidthCache.get(key);
+ if (cached != null)
+ return cached;
+
+ paint.getTextBounds(KEY_LABEL_REFERENCE_CHAR, 0, 1, mTextBounds);
+ final int width = mTextBounds.width();
+ mTextWidthCache.put(key, width);
+ return width;
}
private static void drawIcon(Canvas canvas, Drawable icon, int x, int y, int width,
diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
index c7620f94655155da1ed5bc06bd0663dca9d909f4..8b03360bf388cab66d85b13a9548f66bf5521671 100644
--- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java
+++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java
@@ -670,7 +670,7 @@ public class PointerTracker {
// If keyboard is in manual temporary upper case state and key has manual temporary
// uppercase letter as key hint letter, alternate character code should be sent.
if (mKeyboard.isManualTemporaryUpperCase() && key.hasUppercaseLetter()) {
- code = key.mHintLetter.charAt(0);
+ code = key.mHintLabel.charAt(0);
codes[0] = code;
}
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java b/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java
index 983f0649dad824b9f3c8069afa76946e027fb673..30d9692a80698b061a90bd5c8cd4a5a520d15ff4 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyStyles.java
@@ -165,7 +165,7 @@ public class KeyStyles {
readInt(keyAttr, R.styleable.Keyboard_Key_code);
readText(keyAttr, R.styleable.Keyboard_Key_keyLabel);
readText(keyAttr, R.styleable.Keyboard_Key_keyOutputText);
- readText(keyAttr, R.styleable.Keyboard_Key_keyHintLetter);
+ readText(keyAttr, R.styleable.Keyboard_Key_keyHintLabel);
readTextArray(keyAttr, R.styleable.Keyboard_Key_popupCharacters);
readFlag(keyAttr, R.styleable.Keyboard_Key_keyLabelOption);
readInt(keyAttr, R.styleable.Keyboard_Key_keyIcon);
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
index 37b36825a98948badebe3d2c01be0869e1692e36..1530fed6fdbe812260d8a52d65e759339b6d8741 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
@@ -40,25 +40,15 @@ public class KeyboardIconsSet {
private static final int ICON_RETURN_KEY = 8;
private static final int ICON_SEARCH_KEY = 9;
private static final int ICON_TAB_KEY = 10;
- private static final int ICON_NUM1_KEY = 11;
- private static final int ICON_NUM2_KEY = 12;
- private static final int ICON_NUM3_KEY = 13;
- private static final int ICON_NUM4_KEY = 14;
- private static final int ICON_NUM5_KEY = 15;
- private static final int ICON_NUM6_KEY = 16;
- private static final int ICON_NUM7_KEY = 17;
- private static final int ICON_NUM8_KEY = 18;
- private static final int ICON_NUM9_KEY = 19;
- private static final int ICON_NUM0_KEY = 20;
// This should be aligned with Keyboard.keyIconShifted enum.
- private static final int ICON_SHIFTED_SHIFT_KEY = 21;
+ private static final int ICON_SHIFTED_SHIFT_KEY = 11;
// This should be aligned with Keyboard.keyIconPreview enum.
- private static final int ICON_PREVIEW_SPACE_KEY = 22;
- private static final int ICON_PREVIEW_TAB_KEY = 23;
- private static final int ICON_PREVIEW_SETTINGS_KEY = 24;
- private static final int ICON_PREVIEW_SHORTCUT_KEY = 25;
+ private static final int ICON_PREVIEW_SPACE_KEY = 12;
+ private static final int ICON_PREVIEW_TAB_KEY = 13;
+ private static final int ICON_PREVIEW_SETTINGS_KEY = 14;
+ private static final int ICON_PREVIEW_SHORTCUT_KEY = 15;
- private static final int ICON_LAST = 25;
+ private static final int ICON_LAST = 15;
private final Drawable mIcons[] = new Drawable[ICON_LAST + 1];
@@ -84,26 +74,6 @@ public class KeyboardIconsSet {
return ICON_SEARCH_KEY;
case R.styleable.Keyboard_iconTabKey:
return ICON_TAB_KEY;
- case R.styleable.Keyboard_iconNum1Key:
- return ICON_NUM1_KEY;
- case R.styleable.Keyboard_iconNum2Key:
- return ICON_NUM2_KEY;
- case R.styleable.Keyboard_iconNum3Key:
- return ICON_NUM3_KEY;
- case R.styleable.Keyboard_iconNum4Key:
- return ICON_NUM4_KEY;
- case R.styleable.Keyboard_iconNum5Key:
- return ICON_NUM5_KEY;
- case R.styleable.Keyboard_iconNum6Key:
- return ICON_NUM6_KEY;
- case R.styleable.Keyboard_iconNum7Key:
- return ICON_NUM7_KEY;
- case R.styleable.Keyboard_iconNum8Key:
- return ICON_NUM8_KEY;
- case R.styleable.Keyboard_iconNum9Key:
- return ICON_NUM9_KEY;
- case R.styleable.Keyboard_iconNum0Key:
- return ICON_NUM0_KEY;
case R.styleable.Keyboard_iconShiftedShiftKey:
return ICON_SHIFTED_SHIFT_KEY;
case R.styleable.Keyboard_iconPreviewSpaceKey:
diff --git a/java/src/com/android/inputmethod/keyboard/internal/MiniKeyboardBuilder.java b/java/src/com/android/inputmethod/keyboard/internal/MiniKeyboardBuilder.java
index 040c16ded10368e36146b61e12365c20f1ff2393..1e67eec70104582129fabd96b0595fcd587b9964 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/MiniKeyboardBuilder.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/MiniKeyboardBuilder.java
@@ -221,7 +221,7 @@ public class MiniKeyboardBuilder {
paint = new Paint();
paint.setAntiAlias(true);
}
- final int labelSize = view.getLabelSizeAndSetPaint(label, 0, paint);
+ final int labelSize = view.getDefaultLabelSizeAndSetPaint(paint);
paint.setTextSize(labelSize);
if (bounds == null) bounds = new Rect();
paint.getTextBounds(label.toString(), 0, label.length(), bounds);