diff --git a/java/res/drawable-hdpi/key_hint_at_holo.9.png b/java/res/drawable-hdpi/key_hint_at_holo.9.png deleted file mode 100644 index b93c2d3cf..000000000 Binary files a/java/res/drawable-hdpi/key_hint_at_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_at_large_holo.9.png b/java/res/drawable-hdpi/key_hint_at_large_holo.9.png deleted file mode 100644 index 2b9295158..000000000 Binary files a/java/res/drawable-hdpi/key_hint_at_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_colon_holo.9.png b/java/res/drawable-hdpi/key_hint_colon_holo.9.png deleted file mode 100644 index 8fa17e583..000000000 Binary files a/java/res/drawable-hdpi/key_hint_colon_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-hdpi/key_hint_colon_large_holo.9.png deleted file mode 100644 index 1271341e6..000000000 Binary files a/java/res/drawable-hdpi/key_hint_colon_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_comma_holo.9.png b/java/res/drawable-hdpi/key_hint_comma_holo.9.png deleted file mode 100644 index 44220ec96..000000000 Binary files a/java/res/drawable-hdpi/key_hint_comma_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-hdpi/key_hint_comma_large_holo.9.png deleted file mode 100644 index 444b4d029..000000000 Binary files a/java/res/drawable-hdpi/key_hint_comma_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-hdpi/key_hint_exclamation_holo.9.png deleted file mode 100644 index d5e688400..000000000 Binary files a/java/res/drawable-hdpi/key_hint_exclamation_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-hdpi/key_hint_exclamation_large_holo.9.png deleted file mode 100644 index 5dab2f646..000000000 Binary files a/java/res/drawable-hdpi/key_hint_exclamation_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_num0.9.png b/java/res/drawable-hdpi/key_hint_num0.9.png deleted file mode 100644 index 271264e92..000000000 Binary files a/java/res/drawable-hdpi/key_hint_num0.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_num1.9.png b/java/res/drawable-hdpi/key_hint_num1.9.png deleted file mode 100644 index eaf374262..000000000 Binary files a/java/res/drawable-hdpi/key_hint_num1.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_num2.9.png b/java/res/drawable-hdpi/key_hint_num2.9.png deleted file mode 100644 index 8a1657117..000000000 Binary files a/java/res/drawable-hdpi/key_hint_num2.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_num3.9.png b/java/res/drawable-hdpi/key_hint_num3.9.png deleted file mode 100644 index 34b501109..000000000 Binary files a/java/res/drawable-hdpi/key_hint_num3.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_num4.9.png b/java/res/drawable-hdpi/key_hint_num4.9.png deleted file mode 100644 index d4cc250dd..000000000 Binary files a/java/res/drawable-hdpi/key_hint_num4.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_num5.9.png b/java/res/drawable-hdpi/key_hint_num5.9.png deleted file mode 100644 index 6a054b42f..000000000 Binary files a/java/res/drawable-hdpi/key_hint_num5.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_num6.9.png b/java/res/drawable-hdpi/key_hint_num6.9.png deleted file mode 100644 index 66e91400a..000000000 Binary files a/java/res/drawable-hdpi/key_hint_num6.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_num7.9.png b/java/res/drawable-hdpi/key_hint_num7.9.png deleted file mode 100644 index 5eae24f4f..000000000 Binary files a/java/res/drawable-hdpi/key_hint_num7.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_num8.9.png b/java/res/drawable-hdpi/key_hint_num8.9.png deleted file mode 100644 index ea7f512fd..000000000 Binary files a/java/res/drawable-hdpi/key_hint_num8.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_num9.9.png b/java/res/drawable-hdpi/key_hint_num9.9.png deleted file mode 100644 index 0bf85de93..000000000 Binary files a/java/res/drawable-hdpi/key_hint_num9.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_plus_holo.9.png b/java/res/drawable-hdpi/key_hint_plus_holo.9.png deleted file mode 100644 index a11b4ac07..000000000 Binary files a/java/res/drawable-hdpi/key_hint_plus_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-hdpi/key_hint_plus_large_holo.9.png deleted file mode 100644 index 3c87c1f7e..000000000 Binary files a/java/res/drawable-hdpi/key_hint_plus_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_question_holo.9.png b/java/res/drawable-hdpi/key_hint_question_holo.9.png deleted file mode 100644 index 670b4b902..000000000 Binary files a/java/res/drawable-hdpi/key_hint_question_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_question_large_holo.9.png b/java/res/drawable-hdpi/key_hint_question_large_holo.9.png deleted file mode 100644 index 692f4a68b..000000000 Binary files a/java/res/drawable-hdpi/key_hint_question_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_quote_holo.9.png b/java/res/drawable-hdpi/key_hint_quote_holo.9.png deleted file mode 100644 index 9cc86156e..000000000 Binary files a/java/res/drawable-hdpi/key_hint_quote_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-hdpi/key_hint_quote_large_holo.9.png deleted file mode 100644 index 664467b3e..000000000 Binary files a/java/res/drawable-hdpi/key_hint_quote_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_underline_holo.9.png b/java/res/drawable-hdpi/key_hint_underline_holo.9.png deleted file mode 100644 index 2cb4077a7..000000000 Binary files a/java/res/drawable-hdpi/key_hint_underline_holo.9.png and /dev/null differ diff --git a/java/res/drawable-hdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-hdpi/key_hint_underline_large_holo.9.png deleted file mode 100644 index 6b9a49170..000000000 Binary files a/java/res/drawable-hdpi/key_hint_underline_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_at_holo.9.png b/java/res/drawable-land-hdpi/key_hint_at_holo.9.png deleted file mode 100644 index b93c2d3cf..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_at_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_at_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_at_large_holo.9.png deleted file mode 100644 index 2b9295158..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_at_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_colon_holo.9.png b/java/res/drawable-land-hdpi/key_hint_colon_holo.9.png deleted file mode 100644 index 8fa17e583..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_colon_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_colon_large_holo.9.png deleted file mode 100644 index 1271341e6..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_colon_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_comma_holo.9.png b/java/res/drawable-land-hdpi/key_hint_comma_holo.9.png deleted file mode 100644 index 44220ec96..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_comma_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_comma_large_holo.9.png deleted file mode 100644 index 444b4d029..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_comma_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-land-hdpi/key_hint_exclamation_holo.9.png deleted file mode 100644 index d5e688400..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_exclamation_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_exclamation_large_holo.9.png deleted file mode 100644 index 5dab2f646..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_exclamation_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_plus_holo.9.png b/java/res/drawable-land-hdpi/key_hint_plus_holo.9.png deleted file mode 100644 index a11b4ac07..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_plus_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_plus_large_holo.9.png deleted file mode 100644 index 3c87c1f7e..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_plus_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_question_holo.9.png b/java/res/drawable-land-hdpi/key_hint_question_holo.9.png deleted file mode 100644 index 670b4b902..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_question_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_question_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_question_large_holo.9.png deleted file mode 100644 index 692f4a68b..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_question_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_quote_holo.9.png b/java/res/drawable-land-hdpi/key_hint_quote_holo.9.png deleted file mode 100644 index 9cc86156e..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_quote_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_quote_large_holo.9.png deleted file mode 100644 index 664467b3e..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_quote_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_underline_holo.9.png b/java/res/drawable-land-hdpi/key_hint_underline_holo.9.png deleted file mode 100644 index 2cb4077a7..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_underline_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-hdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_underline_large_holo.9.png deleted file mode 100644 index 6b9a49170..000000000 Binary files a/java/res/drawable-land-hdpi/key_hint_underline_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_at_holo.9.png b/java/res/drawable-land-mdpi/key_hint_at_holo.9.png deleted file mode 100644 index 8c84654c9..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_at_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_at_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_at_large_holo.9.png deleted file mode 100644 index b9e095b99..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_at_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-land-mdpi/key_hint_colon_holo.9.png deleted file mode 100644 index 3cd0e3c4b..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_colon_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_colon_large_holo.9.png deleted file mode 100644 index 01b47b25f..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_colon_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_comma_holo.9.png b/java/res/drawable-land-mdpi/key_hint_comma_holo.9.png deleted file mode 100644 index b70f71b55..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_comma_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_comma_large_holo.9.png deleted file mode 100644 index 1ae82d404..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_comma_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-land-mdpi/key_hint_exclamation_holo.9.png deleted file mode 100644 index 3409535fb..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_exclamation_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_exclamation_large_holo.9.png deleted file mode 100644 index 8dd2f27c4..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_exclamation_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_plus_holo.9.png b/java/res/drawable-land-mdpi/key_hint_plus_holo.9.png deleted file mode 100644 index 51e86ba11..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_plus_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_plus_large_holo.9.png deleted file mode 100644 index bf30f92d8..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_plus_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_question_holo.9.png b/java/res/drawable-land-mdpi/key_hint_question_holo.9.png deleted file mode 100644 index 38b5d6102..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_question_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_question_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_question_large_holo.9.png deleted file mode 100644 index 448a02700..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_question_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_quote_holo.9.png b/java/res/drawable-land-mdpi/key_hint_quote_holo.9.png deleted file mode 100644 index 92fe8eaf8..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_quote_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_quote_large_holo.9.png deleted file mode 100644 index a777d0187..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_quote_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_underline_holo.9.png b/java/res/drawable-land-mdpi/key_hint_underline_holo.9.png deleted file mode 100644 index 7a452c5e2..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_underline_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-mdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_underline_large_holo.9.png deleted file mode 100644 index f738b0202..000000000 Binary files a/java/res/drawable-land-mdpi/key_hint_underline_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_at_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_at_holo.9.png deleted file mode 100644 index 1d257cba2..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_at_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_at_large_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_at_large_holo.9.png deleted file mode 100644 index 53de283da..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_at_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_colon_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_colon_holo.9.png deleted file mode 100644 index 73394b57b..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_colon_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_colon_large_holo.9.png deleted file mode 100644 index a4a6acbe1..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_colon_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_comma_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_comma_holo.9.png deleted file mode 100644 index d4dbdf4bf..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_comma_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_comma_large_holo.9.png deleted file mode 100644 index aea5c8ed5..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_comma_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_exclamation_holo.9.png deleted file mode 100644 index 078d1d8f7..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_exclamation_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_exclamation_large_holo.9.png deleted file mode 100644 index ddd6b13cb..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_exclamation_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_plus_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_plus_holo.9.png deleted file mode 100644 index d0ce9c948..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_plus_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_plus_large_holo.9.png deleted file mode 100644 index 9cf20e8b1..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_plus_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_question_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_question_holo.9.png deleted file mode 100644 index 1e886d897..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_question_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_question_large_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_question_large_holo.9.png deleted file mode 100644 index 826228796..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_question_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_quote_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_quote_holo.9.png deleted file mode 100644 index fd8bbad83..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_quote_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_quote_large_holo.9.png deleted file mode 100644 index 51d5b498c..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_quote_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_underline_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_underline_holo.9.png deleted file mode 100644 index 37d2fa58e..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_underline_holo.9.png and /dev/null differ diff --git a/java/res/drawable-land-xhdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-land-xhdpi/key_hint_underline_large_holo.9.png deleted file mode 100644 index 4249a8edf..000000000 Binary files a/java/res/drawable-land-xhdpi/key_hint_underline_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_at_holo.9.png b/java/res/drawable-mdpi/key_hint_at_holo.9.png deleted file mode 100644 index 8c84654c9..000000000 Binary files a/java/res/drawable-mdpi/key_hint_at_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_at_large_holo.9.png b/java/res/drawable-mdpi/key_hint_at_large_holo.9.png deleted file mode 100644 index b9e095b99..000000000 Binary files a/java/res/drawable-mdpi/key_hint_at_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-mdpi/key_hint_colon_holo.9.png deleted file mode 100644 index 3cd0e3c4b..000000000 Binary files a/java/res/drawable-mdpi/key_hint_colon_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-mdpi/key_hint_colon_large_holo.9.png deleted file mode 100644 index 01b47b25f..000000000 Binary files a/java/res/drawable-mdpi/key_hint_colon_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_comma_holo.9.png b/java/res/drawable-mdpi/key_hint_comma_holo.9.png deleted file mode 100644 index b70f71b55..000000000 Binary files a/java/res/drawable-mdpi/key_hint_comma_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-mdpi/key_hint_comma_large_holo.9.png deleted file mode 100644 index 1ae82d404..000000000 Binary files a/java/res/drawable-mdpi/key_hint_comma_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-mdpi/key_hint_exclamation_holo.9.png deleted file mode 100644 index 3409535fb..000000000 Binary files a/java/res/drawable-mdpi/key_hint_exclamation_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-mdpi/key_hint_exclamation_large_holo.9.png deleted file mode 100644 index 8dd2f27c4..000000000 Binary files a/java/res/drawable-mdpi/key_hint_exclamation_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_num0.9.png b/java/res/drawable-mdpi/key_hint_num0.9.png deleted file mode 100644 index 61ad1b50a..000000000 Binary files a/java/res/drawable-mdpi/key_hint_num0.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_num1.9.png b/java/res/drawable-mdpi/key_hint_num1.9.png deleted file mode 100644 index cd7772e71..000000000 Binary files a/java/res/drawable-mdpi/key_hint_num1.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_num2.9.png b/java/res/drawable-mdpi/key_hint_num2.9.png deleted file mode 100644 index fa5f8b79c..000000000 Binary files a/java/res/drawable-mdpi/key_hint_num2.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_num3.9.png b/java/res/drawable-mdpi/key_hint_num3.9.png deleted file mode 100644 index 0c7336cb7..000000000 Binary files a/java/res/drawable-mdpi/key_hint_num3.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_num4.9.png b/java/res/drawable-mdpi/key_hint_num4.9.png deleted file mode 100644 index 73ef06c0e..000000000 Binary files a/java/res/drawable-mdpi/key_hint_num4.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_num5.9.png b/java/res/drawable-mdpi/key_hint_num5.9.png deleted file mode 100644 index aea460e1c..000000000 Binary files a/java/res/drawable-mdpi/key_hint_num5.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_num6.9.png b/java/res/drawable-mdpi/key_hint_num6.9.png deleted file mode 100644 index 16a9237e3..000000000 Binary files a/java/res/drawable-mdpi/key_hint_num6.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_num7.9.png b/java/res/drawable-mdpi/key_hint_num7.9.png deleted file mode 100644 index 6747a19c0..000000000 Binary files a/java/res/drawable-mdpi/key_hint_num7.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_num8.9.png b/java/res/drawable-mdpi/key_hint_num8.9.png deleted file mode 100644 index 28be2fb86..000000000 Binary files a/java/res/drawable-mdpi/key_hint_num8.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_num9.9.png b/java/res/drawable-mdpi/key_hint_num9.9.png deleted file mode 100644 index 731d63b1b..000000000 Binary files a/java/res/drawable-mdpi/key_hint_num9.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_plus_holo.9.png b/java/res/drawable-mdpi/key_hint_plus_holo.9.png deleted file mode 100644 index 51e86ba11..000000000 Binary files a/java/res/drawable-mdpi/key_hint_plus_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-mdpi/key_hint_plus_large_holo.9.png deleted file mode 100644 index bf30f92d8..000000000 Binary files a/java/res/drawable-mdpi/key_hint_plus_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_question_holo.9.png b/java/res/drawable-mdpi/key_hint_question_holo.9.png deleted file mode 100644 index 38b5d6102..000000000 Binary files a/java/res/drawable-mdpi/key_hint_question_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_question_large_holo.9.png b/java/res/drawable-mdpi/key_hint_question_large_holo.9.png deleted file mode 100644 index 448a02700..000000000 Binary files a/java/res/drawable-mdpi/key_hint_question_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_quote_holo.9.png b/java/res/drawable-mdpi/key_hint_quote_holo.9.png deleted file mode 100644 index 92fe8eaf8..000000000 Binary files a/java/res/drawable-mdpi/key_hint_quote_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-mdpi/key_hint_quote_large_holo.9.png deleted file mode 100644 index a777d0187..000000000 Binary files a/java/res/drawable-mdpi/key_hint_quote_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_underline_holo.9.png b/java/res/drawable-mdpi/key_hint_underline_holo.9.png deleted file mode 100644 index 7a452c5e2..000000000 Binary files a/java/res/drawable-mdpi/key_hint_underline_holo.9.png and /dev/null differ diff --git a/java/res/drawable-mdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-mdpi/key_hint_underline_large_holo.9.png deleted file mode 100644 index f738b0202..000000000 Binary files a/java/res/drawable-mdpi/key_hint_underline_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_at_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_at_holo.9.png deleted file mode 100644 index 8c84654c9..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_at_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_at_large_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_at_large_holo.9.png deleted file mode 100644 index b9e095b99..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_at_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_colon_holo.9.png deleted file mode 100644 index 3cd0e3c4b..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_colon_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_colon_large_holo.9.png deleted file mode 100644 index 01b47b25f..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_colon_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_comma_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_comma_holo.9.png deleted file mode 100644 index b70f71b55..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_comma_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_comma_large_holo.9.png deleted file mode 100644 index 1ae82d404..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_comma_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_exclamation_holo.9.png deleted file mode 100644 index 3409535fb..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_exclamation_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_exclamation_large_holo.9.png deleted file mode 100644 index 8dd2f27c4..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_exclamation_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_plus_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_plus_holo.9.png deleted file mode 100644 index 51e86ba11..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_plus_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_plus_large_holo.9.png deleted file mode 100644 index bf30f92d8..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_plus_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_question_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_question_holo.9.png deleted file mode 100644 index 38b5d6102..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_question_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_question_large_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_question_large_holo.9.png deleted file mode 100644 index 448a02700..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_question_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_quote_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_quote_holo.9.png deleted file mode 100644 index 92fe8eaf8..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_quote_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_quote_large_holo.9.png deleted file mode 100644 index a777d0187..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_quote_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_underline_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_underline_holo.9.png deleted file mode 100644 index 7a452c5e2..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_underline_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_underline_large_holo.9.png deleted file mode 100644 index f738b0202..000000000 Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_underline_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_at_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_at_holo.9.png deleted file mode 100644 index 5b946ff9b..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_at_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_at_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_at_large_holo.9.png deleted file mode 100644 index 852f899ed..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_at_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_holo.9.png deleted file mode 100644 index 1d9346e6f..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_large_holo.9.png deleted file mode 100644 index 17e9091b4..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_holo.9.png deleted file mode 100644 index c2a913c04..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_large_holo.9.png deleted file mode 100644 index 846f213f1..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_holo.9.png deleted file mode 100644 index ce8e8de43..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_large_holo.9.png deleted file mode 100644 index 035dcf85d..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_holo.9.png deleted file mode 100644 index 931390b45..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_large_holo.9.png deleted file mode 100644 index e6f9f8a9c..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_question_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_question_holo.9.png deleted file mode 100644 index 6cbeb5993..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_question_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_question_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_question_large_holo.9.png deleted file mode 100644 index bfd58de09..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_question_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_holo.9.png deleted file mode 100644 index 3b361b71c..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_large_holo.9.png deleted file mode 100644 index 2a08aa12e..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_holo.9.png deleted file mode 100644 index 06f3efb7e..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_large_holo.9.png deleted file mode 100644 index 50f99a191..000000000 Binary files a/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_at_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_at_holo.9.png deleted file mode 100644 index 8c84654c9..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_at_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_at_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_at_large_holo.9.png deleted file mode 100644 index b9e095b99..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_at_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_colon_holo.9.png deleted file mode 100644 index 3cd0e3c4b..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_colon_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_colon_large_holo.9.png deleted file mode 100644 index 01b47b25f..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_colon_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_comma_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_comma_holo.9.png deleted file mode 100644 index b70f71b55..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_comma_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_comma_large_holo.9.png deleted file mode 100644 index 1ae82d404..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_comma_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_holo.9.png deleted file mode 100644 index 3409535fb..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_large_holo.9.png deleted file mode 100644 index 8dd2f27c4..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_plus_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_plus_holo.9.png deleted file mode 100644 index 51e86ba11..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_plus_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_plus_large_holo.9.png deleted file mode 100644 index bf30f92d8..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_plus_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_question_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_question_holo.9.png deleted file mode 100644 index 38b5d6102..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_question_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_question_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_question_large_holo.9.png deleted file mode 100644 index 448a02700..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_question_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_quote_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_quote_holo.9.png deleted file mode 100644 index 92fe8eaf8..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_quote_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_quote_large_holo.9.png deleted file mode 100644 index a777d0187..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_quote_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_underline_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_underline_holo.9.png deleted file mode 100644 index 7a452c5e2..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_underline_holo.9.png and /dev/null differ diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_underline_large_holo.9.png deleted file mode 100644 index f738b0202..000000000 Binary files a/java/res/drawable-sw768dp-mdpi/key_hint_underline_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_at_holo.9.png b/java/res/drawable-xhdpi/key_hint_at_holo.9.png deleted file mode 100644 index 1d257cba2..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_at_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_at_large_holo.9.png b/java/res/drawable-xhdpi/key_hint_at_large_holo.9.png deleted file mode 100644 index 53de283da..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_at_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_colon_holo.9.png b/java/res/drawable-xhdpi/key_hint_colon_holo.9.png deleted file mode 100644 index 73394b57b..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_colon_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-xhdpi/key_hint_colon_large_holo.9.png deleted file mode 100644 index a4a6acbe1..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_colon_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_comma_holo.9.png b/java/res/drawable-xhdpi/key_hint_comma_holo.9.png deleted file mode 100644 index d4dbdf4bf..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_comma_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-xhdpi/key_hint_comma_large_holo.9.png deleted file mode 100644 index aea5c8ed5..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_comma_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-xhdpi/key_hint_exclamation_holo.9.png deleted file mode 100644 index 078d1d8f7..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_exclamation_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-xhdpi/key_hint_exclamation_large_holo.9.png deleted file mode 100644 index ddd6b13cb..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_exclamation_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_plus_holo.9.png b/java/res/drawable-xhdpi/key_hint_plus_holo.9.png deleted file mode 100644 index d0ce9c948..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_plus_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-xhdpi/key_hint_plus_large_holo.9.png deleted file mode 100644 index 9cf20e8b1..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_plus_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_question_holo.9.png b/java/res/drawable-xhdpi/key_hint_question_holo.9.png deleted file mode 100644 index 1e886d897..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_question_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_question_large_holo.9.png b/java/res/drawable-xhdpi/key_hint_question_large_holo.9.png deleted file mode 100644 index 826228796..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_question_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_quote_holo.9.png b/java/res/drawable-xhdpi/key_hint_quote_holo.9.png deleted file mode 100644 index fd8bbad83..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_quote_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-xhdpi/key_hint_quote_large_holo.9.png deleted file mode 100644 index 51d5b498c..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_quote_large_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_underline_holo.9.png b/java/res/drawable-xhdpi/key_hint_underline_holo.9.png deleted file mode 100644 index 37d2fa58e..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_underline_holo.9.png and /dev/null differ diff --git a/java/res/drawable-xhdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-xhdpi/key_hint_underline_large_holo.9.png deleted file mode 100644 index 4249a8edf..000000000 Binary files a/java/res/drawable-xhdpi/key_hint_underline_large_holo.9.png and /dev/null differ diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index 6b52ad4e1..7fc1571b2 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -30,7 +30,9 @@ 0.0in 0.0in 55% - 35% + 35% + 28% + 40% 0.08in 90% 38dip diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index 618b7f44c..beb5263f6 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -31,8 +31,10 @@ 13.0mm - 25dip - 18dip + 30.7% + 21.9% + 23% + 25% 18dip 40.0mm diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 7cdf72726..62ab0d286 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -40,7 +40,9 @@ -13.0mm 45% - 29% + 29% + 23% + 35% 82% 6dip diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml index ce3614516..81d91cebf 100644 --- a/java/res/values-sw768dp-land/dimens.xml +++ b/java/res/values-sw768dp-land/dimens.xml @@ -32,7 +32,9 @@ 0.0mm 30.7% - 21.9% + 21.9% + 23% + 25% 18dip 26.5mm diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index cb380fbe4..74eab5f28 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -39,7 +39,9 @@ -13.0mm 34.4% - 21.2% + 21.2% + 23% + 28% 6dip 26.3% diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 3bed8806a..2db529ea2 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -39,19 +39,27 @@ checkable+checked+pressed. --> - + - - - + + + + + + + + + + + + + - - + + @@ -75,7 +83,7 @@ - + @@ -131,8 +139,6 @@ - - @@ -163,24 +169,20 @@ - + + + - + + - - - - - - diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index e26cad3f2..a76c78a4c 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -44,7 +44,9 @@ -0.05in 45% - 29% + 29% + 23% + 35% 21dip 80sp diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 37f1fe3c6..6f973d9e5 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -17,7 +17,6 @@ @@ -102,20 +107,19 @@ diff --git a/java/res/xml-sw600dp/kbd_azerty_rows.xml b/java/res/xml-sw600dp/kbd_azerty_rows.xml index 99c56e4cf..269c6ef8f 100644 --- a/java/res/xml-sw600dp/kbd_azerty_rows.xml +++ b/java/res/xml-sw600dp/kbd_azerty_rows.xml @@ -137,15 +137,13 @@ diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml index b20bb243f..cf0e5236c 100644 --- a/java/res/xml-sw600dp/kbd_phone.xml +++ b/java/res/xml-sw600dp/kbd_phone.xml @@ -36,13 +36,11 @@ diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml index 3e5492e3d..49e377fa7 100644 --- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml +++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml @@ -48,9 +48,8 @@ @@ -75,18 +74,16 @@ > @@ -102,9 +99,8 @@ @@ -125,18 +121,16 @@ > @@ -152,9 +146,8 @@ diff --git a/java/res/xml-sw600dp/kbd_qwertz_rows.xml b/java/res/xml-sw600dp/kbd_qwertz_rows.xml index 9e717c804..7ea9b0f37 100644 --- a/java/res/xml-sw600dp/kbd_qwertz_rows.xml +++ b/java/res/xml-sw600dp/kbd_qwertz_rows.xml @@ -103,15 +103,13 @@ diff --git a/java/res/xml-sw600dp/kbd_row3_right.xml b/java/res/xml-sw600dp/kbd_row3_right.xml index 6f7d40bda..a9c5eb371 100644 --- a/java/res/xml-sw600dp/kbd_row3_right.xml +++ b/java/res/xml-sw600dp/kbd_row3_right.xml @@ -36,9 +36,8 @@ > diff --git a/java/res/xml-sw600dp/kbd_sr_rows.xml b/java/res/xml-sw600dp/kbd_sr_rows.xml index 62c3b71d0..80debdadb 100644 --- a/java/res/xml-sw600dp/kbd_sr_rows.xml +++ b/java/res/xml-sw600dp/kbd_sr_rows.xml @@ -126,15 +126,13 @@ diff --git a/java/res/xml-sw768dp/kbd_azerty_rows.xml b/java/res/xml-sw768dp/kbd_azerty_rows.xml index 5288ccf91..3bcba0042 100644 --- a/java/res/xml-sw768dp/kbd_azerty_rows.xml +++ b/java/res/xml-sw768dp/kbd_azerty_rows.xml @@ -133,9 +133,8 @@ latin:popupCharacters="@string/alternates_for_n" /> diff --git a/java/res/xml-sw768dp/kbd_phone.xml b/java/res/xml-sw768dp/kbd_phone.xml index 51627aa6a..0c6523383 100644 --- a/java/res/xml-sw768dp/kbd_phone.xml +++ b/java/res/xml-sw768dp/kbd_phone.xml @@ -41,16 +41,12 @@ latin:keyLabelOption="alignLeft" latin:keyWidth="11.172%p" latin:keyEdgeFlags="left" /> - - - - @@ -75,20 +71,16 @@ latin:keyWidth="11.172%p" latin:keyEdgeFlags="left" /> - @@ -103,22 +95,17 @@ latin:keyEdgeFlags="right" /> - @@ -78,9 +77,8 @@ @@ -102,17 +100,15 @@ > @@ -126,9 +122,8 @@ diff --git a/java/res/xml-sw768dp/kbd_qwertz_rows.xml b/java/res/xml-sw768dp/kbd_qwertz_rows.xml index 4e937acda..8d5f1e6d4 100644 --- a/java/res/xml-sw768dp/kbd_qwertz_rows.xml +++ b/java/res/xml-sw768dp/kbd_qwertz_rows.xml @@ -106,15 +106,13 @@ diff --git a/java/res/xml-sw768dp/kbd_row3_right2.xml b/java/res/xml-sw768dp/kbd_row3_right2.xml index 1759ea192..e90de8eec 100644 --- a/java/res/xml-sw768dp/kbd_row3_right2.xml +++ b/java/res/xml-sw768dp/kbd_row3_right2.xml @@ -33,15 +33,13 @@ diff --git a/java/res/xml/kbd_azerty_rows.xml b/java/res/xml/kbd_azerty_rows.xml index 9c81aad71..9825c4a10 100644 --- a/java/res/xml/kbd_azerty_rows.xml +++ b/java/res/xml/kbd_azerty_rows.xml @@ -29,44 +29,44 @@ > diff --git a/java/res/xml/kbd_qwerty_row1.xml b/java/res/xml/kbd_qwerty_row1.xml index ba804d321..8c3669de0 100644 --- a/java/res/xml/kbd_qwerty_row1.xml +++ b/java/res/xml/kbd_qwerty_row1.xml @@ -27,44 +27,44 @@ > diff --git a/java/res/xml/kbd_qwerty_rows_scandinavia.xml b/java/res/xml/kbd_qwerty_rows_scandinavia.xml index 8cb0640e5..2d7dcde7a 100644 --- a/java/res/xml/kbd_qwerty_rows_scandinavia.xml +++ b/java/res/xml/kbd_qwerty_rows_scandinavia.xml @@ -29,45 +29,45 @@ > diff --git a/java/res/xml/kbd_ru_rows.xml b/java/res/xml/kbd_ru_rows.xml index 76250a303..ff9fef409 100644 --- a/java/res/xml/kbd_ru_rows.xml +++ b/java/res/xml/kbd_ru_rows.xml @@ -29,45 +29,45 @@ > mTextHeightCache = new HashMap(); + // This map caches key label text width in pixel as value and key label text size as map key. + private final HashMap mTextWidthCache = new HashMap(); // Distance from horizontal center of the key, proportional to key label text height and width. - private final float KEY_LABEL_VERTICAL_ADJUSTMENT_FACTOR_CENTER = 0.45f; - private final float KEY_LABEL_VERTICAL_PADDING_FACTOR = 1.60f; - private final String KEY_LABEL_REFERENCE_CHAR = "H"; - private final int KEY_LABEL_OPTION_ALIGN_LEFT = 0x01; - private final int KEY_LABEL_OPTION_ALIGN_RIGHT = 0x02; - private final int KEY_LABEL_OPTION_ALIGN_BOTTOM = 0x08; - private final int KEY_LABEL_OPTION_FONT_NORMAL = 0x10; - private final int KEY_LABEL_OPTION_POPUP_HINT = 0x20; + private static final float KEY_LABEL_VERTICAL_ADJUSTMENT_FACTOR_CENTER = 0.45f; + private static final float KEY_LABEL_VERTICAL_PADDING_FACTOR = 1.60f; + private static final String KEY_LABEL_REFERENCE_CHAR = "M"; private final int mKeyLabelHorizontalPadding; private final UIHandler mHandler = new UIHandler(); @@ -322,17 +333,26 @@ 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); + mKeyLabelRatio = getRatio(a, R.styleable.KeyboardView_keyLabelRatio); + mKeyHintLetterRatio = getRatio(a, R.styleable.KeyboardView_keyHintLetterRatio); + mKeyUppercaseLetterRatio = getRatio(a, + R.styleable.KeyboardView_keyUppercaseLetterRatio); mKeyTextColor = a.getColor(R.styleable.KeyboardView_keyTextColor, 0xFF000000); - mKeyTextColorDisabled = a.getColor( - R.styleable.KeyboardView_keyTextColorDisabled, 0xFF000000); - mLabelTextRatio = getRatio(a, R.styleable.KeyboardView_labelTextRatio); + mKeyTextInactivatedColor = a.getColor( + R.styleable.KeyboardView_keyTextInactivatedColor, 0xFF000000); + mKeyPopupHintIcon = a.getDrawable(R.styleable.KeyboardView_keyPopupHintIcon); + mKeyHintLetterColor = a.getColor(R.styleable.KeyboardView_keyHintLetterColor, 0); + mKeyUppercaseLetterInactivatedColor = a.getColor( + R.styleable.KeyboardView_keyUppercaseLetterInactivatedColor, 0); + mKeyUppercaseLetterActivatedColor = a.getColor( + R.styleable.KeyboardView_keyUppercaseLetterActivatedColor, 0); + mKeyTextStyle = Typeface.defaultFromStyle( + a.getInt(R.styleable.KeyboardView_keyTextStyle, Typeface.NORMAL)); mPopupLayout = a.getResourceId(R.styleable.KeyboardView_popupLayout, 0); mShadowColor = a.getColor(R.styleable.KeyboardView_shadowColor, 0); mShadowRadius = a.getFloat(R.styleable.KeyboardView_shadowRadius, 0f); // TODO: Use Theme (android.R.styleable.Theme_backgroundDimAmount) mBackgroundDimAmount = a.getFloat(R.styleable.KeyboardView_backgroundDimAmount, 0.5f); - mKeyLetterStyle = Typeface.defaultFromStyle( - a.getInt(R.styleable.KeyboardView_keyLetterStyle, Typeface.NORMAL)); mColorScheme = a.getInt(R.styleable.KeyboardView_colorScheme, COLOR_SCHEME_WHITE); a.recycle(); @@ -349,12 +369,10 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { mKeyLabelHorizontalPadding = (int)res.getDimension( R.dimen.key_label_horizontal_alignment_padding); - mPaint = new Paint(); mPaint.setAntiAlias(true); mPaint.setTextAlign(Align.CENTER); mPaint.setAlpha(255); - mPadding = new Rect(0, 0, 0, 0); mKeyBackground.getPadding(mPadding); mSwipeThreshold = (int) (500 * res.getDisplayMetrics().density); @@ -498,7 +516,10 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { mPopupPanelCache.clear(); final int keyHeight = keyboard.getRowHeight() - keyboard.getVerticalGap(); mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio); - mLabelTextSize = (int)(keyHeight * mLabelTextRatio); + mKeyLabelSize = (int)(keyHeight * mKeyLabelRatio); + mKeyHintLetterSize = (int)(keyHeight * mKeyHintLetterRatio); + mKeyUppercaseLetterSize = (int)( + keyHeight * mKeyUppercaseLetterRatio); mPreviewTextSize = (int)(keyHeight * mPreviewTextRatio); } @@ -685,7 +706,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { // Vertical label text alignment. final float baseline; - if ((key.mLabelOption & KEY_LABEL_OPTION_ALIGN_BOTTOM) != 0) { + 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, @@ -699,12 +720,12 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { } // Horizontal label text alignment final int positionX; - if ((key.mLabelOption & KEY_LABEL_OPTION_ALIGN_LEFT) != 0) { + if ((key.mLabelOption & Key.LABEL_OPTION_ALIGN_LEFT) != 0) { positionX = mKeyLabelHorizontalPadding + padding.left; 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) { + } else if ((key.mLabelOption & Key.LABEL_OPTION_ALIGN_RIGHT) != 0) { positionX = keyDrawWidth - mKeyLabelHorizontalPadding - padding.right; paint.setTextAlign(Align.RIGHT); if (DEBUG_SHOW_ALIGN) @@ -717,8 +738,8 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { drawVerticalLine(canvas, positionX, rowHeight, 0xc0008080, new Paint()); } } - if (key.mManualTemporaryUpperCaseHintIcon != null && isManualTemporaryUpperCase) { - paint.setColor(mKeyTextColorDisabled); + if (key.hasUppercaseLetter() && isManualTemporaryUpperCase) { + paint.setColor(mKeyTextInactivatedColor); } else { paint.setColor(mKeyTextColor); } @@ -734,6 +755,27 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { 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; + if (key.hasUppercaseLetter()) { + textColor = isManualTemporaryUpperCase ? mKeyUppercaseLetterActivatedColor + : mKeyUppercaseLetterInactivatedColor; + textSize = mKeyUppercaseLetterSize; + } else { + textColor = mKeyHintLetterColor; + textSize = mKeyHintLetterSize; + } + paint.setColor(textColor); + paint.setTextSize(textSize); + // 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); + } + // Draw key icon. final Drawable icon = key.getIcon(); if (key.mLabel == null && icon != null) { @@ -741,11 +783,11 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { final int drawableHeight = icon.getIntrinsicHeight(); final int drawableX; final int drawableY = (key.mHeight + padding.top - padding.bottom - drawableHeight) / 2; - if ((key.mLabelOption & KEY_LABEL_OPTION_ALIGN_LEFT) != 0) { + if ((key.mLabelOption & Key.LABEL_OPTION_ALIGN_LEFT) != 0) { drawableX = padding.left + mKeyLabelHorizontalPadding; if (DEBUG_SHOW_ALIGN) drawVerticalLine(canvas, drawableX, rowHeight, 0xc0800080, new Paint()); - } else if ((key.mLabelOption & KEY_LABEL_OPTION_ALIGN_RIGHT) != 0) { + } else if ((key.mLabelOption & Key.LABEL_OPTION_ALIGN_RIGHT) != 0) { drawableX = keyDrawWidth - padding.right - mKeyLabelHorizontalPadding - drawableWidth; if (DEBUG_SHOW_ALIGN) @@ -763,16 +805,14 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { 0x80c00000, new Paint()); } - // Draw hint icon. - if (key.mHintIcon != null || (key.mLabelOption & KEY_LABEL_OPTION_POPUP_HINT) != 0) { + // Draw popup hint icon "...". + // TODO: Draw "..." by text. + if (key.hasPopupHint()) { final int drawableWidth = keyDrawWidth; final int drawableHeight = key.mHeight; final int drawableX = 0; final int drawableY = HINT_ICON_VERTICAL_ADJUSTMENT_PIXEL; - Drawable hintIcon = (isManualTemporaryUpperCase - && key.mManualTemporaryUpperCaseHintIcon != null) - ? key.mManualTemporaryUpperCaseHintIcon - : (key.mHintIcon != null ? key.mHintIcon : mKeyboard.mPopupHintIcon); + final Drawable hintIcon = mKeyPopupHintIcon; drawIcon(canvas, hintIcon, drawableX, drawableY, drawableWidth, drawableHeight); if (DEBUG_SHOW_ALIGN) drawRectangle(canvas, drawableX, drawableY, drawableWidth, drawableHeight, @@ -787,15 +827,15 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { final int labelSize; final Typeface labelStyle; if (label.length() > 1) { - labelSize = mLabelTextSize; - if ((keyLabelOption & KEY_LABEL_OPTION_FONT_NORMAL) != 0) { + labelSize = mKeyLabelSize; + if ((keyLabelOption & Key.LABEL_OPTION_FONT_NORMAL) != 0) { labelStyle = Typeface.DEFAULT; } else { labelStyle = Typeface.DEFAULT_BOLD; } } else { labelSize = mKeyLetterSize; - labelStyle = mKeyLetterStyle; + labelStyle = mKeyTextStyle; } paint.setTextSize(labelSize); paint.setTypeface(labelStyle); @@ -808,14 +848,26 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { if (labelHeightValue != null) { labelCharHeight = labelHeightValue; } else { - Rect textBounds = new Rect(); - paint.getTextBounds(KEY_LABEL_REFERENCE_CHAR, 0, 1, textBounds); - labelCharHeight = textBounds.height(); + paint.getTextBounds(KEY_LABEL_REFERENCE_CHAR, 0, 1, mTextBounds); + labelCharHeight = mTextBounds.height(); mTextHeightCache.put(labelSize, labelCharHeight); } return labelCharHeight; } + private int getLabelCharWidth(int labelSize, Paint paint) { + Integer labelWidthValue = mTextWidthCache.get(labelSize); + final int labelCharWidth; + if (labelWidthValue != null) { + labelCharWidth = labelWidthValue; + } else { + paint.getTextBounds(KEY_LABEL_REFERENCE_CHAR, 0, 1, mTextBounds); + labelCharWidth = mTextBounds.width(); + mTextWidthCache.put(labelSize, labelCharWidth); + } + return labelCharWidth; + } + private static void drawIcon(Canvas canvas, Drawable icon, int x, int y, int width, int height) { canvas.translate(x, y); @@ -938,7 +990,7 @@ public class KeyboardView extends View implements PointerTracker.UIProxy { previewText.setTypeface(Typeface.DEFAULT_BOLD); } else { previewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, mPreviewTextSize); - previewText.setTypeface(mKeyLetterStyle); + previewText.setTypeface(mKeyTextStyle); } } else { final Drawable previewIcon = key.getPreviewIcon(); diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index cf8458978..397ac7eec 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -639,8 +639,7 @@ public class PointerTracker { Key key = getKey(keyIndex); if (key.mCode == Keyboard.CODE_SHIFT) { mHandler.startLongPressShiftTimer(mLongPressShiftKeyTimeout, keyIndex, this); - } else if (key.mManualTemporaryUpperCaseCode != Keyboard.CODE_DUMMY - && mKeyboard.isManualTemporaryUpperCase()) { + } else if (key.hasUppercaseLetter() && mKeyboard.isManualTemporaryUpperCase()) { // We need not start long press timer on the key which has manual temporary upper case // code defined and the keyboard is in manual temporary upper case mode. return; @@ -667,10 +666,9 @@ public class PointerTracker { mKeyDetector.getKeyIndexAndNearbyCodes(x, y, codes); // If keyboard is in manual temporary upper case state and key has manual temporary - // shift code, alternate character code should be sent. - if (mKeyboard.isManualTemporaryUpperCase() - && key.mManualTemporaryUpperCaseCode != Keyboard.CODE_DUMMY) { - code = key.mManualTemporaryUpperCaseCode; + // uppercase letter as key hint letter, alternate character code should be sent. + if (mKeyboard.isManualTemporaryUpperCase() && key.hasUppercaseLetter()) { + code = key.mHintLetter.charAt(0); codes[0] = code; }