Merge "Draw phone/number keyboard layout witout icon"

2011-06-27 04:17:51 -07:00 · 2011-06-27 04:17:51 -07:00 · d8850ae1ab
parent b47319867e 520a297ad1
commit d8850ae1ab
150 changed files with 577 additions and 517 deletions
--- a/java/res/drawable-hdpi/sym_bkeyboard_num0.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num0.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_num1.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num1.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_num2.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num2.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_num3.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num3.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_num4.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num4.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_num5.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num5.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_num6.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num6.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_num7.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num7.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_num8.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num8.png
--- a/java/res/drawable-hdpi/sym_bkeyboard_num9.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num9.png
--- a/java/res/drawable-hdpi/sym_keyboard_123_mic_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_123_mic_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_delete_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_delete_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_num0.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num0.png
--- a/java/res/drawable-hdpi/sym_keyboard_num0_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num0_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_num1.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num1.png
--- a/java/res/drawable-hdpi/sym_keyboard_num1_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num1_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_num2.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num2.png
--- a/java/res/drawable-hdpi/sym_keyboard_num2_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num2_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_num3.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num3.png
--- a/java/res/drawable-hdpi/sym_keyboard_num3_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num3_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_num4.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num4.png
--- a/java/res/drawable-hdpi/sym_keyboard_num4_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num4_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_num5.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num5.png
--- a/java/res/drawable-hdpi/sym_keyboard_num5_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num5_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_num6.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num6.png
--- a/java/res/drawable-hdpi/sym_keyboard_num6_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num6_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_num7.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num7.png
--- a/java/res/drawable-hdpi/sym_keyboard_num7_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num7_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_num8.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num8.png
--- a/java/res/drawable-hdpi/sym_keyboard_num8_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num8_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_num9.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num9.png
--- a/java/res/drawable-hdpi/sym_keyboard_num9_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num9_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_return_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_return_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_settings_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_settings_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_shift_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_shift_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_space_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_space_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_tab_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_tab_holo.png
--- a/java/res/drawable-hdpi/sym_keyboard_voice_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_voice_holo.png
--- a/java/res/drawable-mdpi/sym_bkeyboard_num0.png
+++ b/java/res/drawable-mdpi/sym_bkeyboard_num0.png
--- a/java/res/drawable-mdpi/sym_bkeyboard_num1.png
+++ b/java/res/drawable-mdpi/sym_bkeyboard_num1.png
--- a/java/res/drawable-mdpi/sym_bkeyboard_num2.png
+++ b/java/res/drawable-mdpi/sym_bkeyboard_num2.png
--- a/java/res/drawable-mdpi/sym_bkeyboard_num3.png
+++ b/java/res/drawable-mdpi/sym_bkeyboard_num3.png
--- a/java/res/drawable-mdpi/sym_bkeyboard_num4.png
+++ b/java/res/drawable-mdpi/sym_bkeyboard_num4.png
--- a/java/res/drawable-mdpi/sym_bkeyboard_num5.png
+++ b/java/res/drawable-mdpi/sym_bkeyboard_num5.png
--- a/java/res/drawable-mdpi/sym_bkeyboard_num6.png
+++ b/java/res/drawable-mdpi/sym_bkeyboard_num6.png
--- a/java/res/drawable-mdpi/sym_bkeyboard_num7.png
+++ b/java/res/drawable-mdpi/sym_bkeyboard_num7.png
--- a/java/res/drawable-mdpi/sym_bkeyboard_num8.png
+++ b/java/res/drawable-mdpi/sym_bkeyboard_num8.png
--- a/java/res/drawable-mdpi/sym_bkeyboard_num9.png
+++ b/java/res/drawable-mdpi/sym_bkeyboard_num9.png
--- a/java/res/drawable-mdpi/sym_keyboard_num0.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num0.png
--- a/java/res/drawable-mdpi/sym_keyboard_num0_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num0_holo.png
--- a/java/res/drawable-mdpi/sym_keyboard_num1.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num1.png
--- a/java/res/drawable-mdpi/sym_keyboard_num1_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num1_holo.png
--- a/java/res/drawable-mdpi/sym_keyboard_num2.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num2.png
--- a/java/res/drawable-mdpi/sym_keyboard_num2_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num2_holo.png
--- a/java/res/drawable-mdpi/sym_keyboard_num3.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num3.png
--- a/java/res/drawable-mdpi/sym_keyboard_num3_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num3_holo.png
--- a/java/res/drawable-mdpi/sym_keyboard_num4.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num4.png
--- a/java/res/drawable-mdpi/sym_keyboard_num4_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num4_holo.png
--- a/java/res/drawable-mdpi/sym_keyboard_num5.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num5.png
--- a/java/res/drawable-mdpi/sym_keyboard_num5_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num5_holo.png
--- a/java/res/drawable-mdpi/sym_keyboard_num6.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num6.png
--- a/java/res/drawable-mdpi/sym_keyboard_num6_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num6_holo.png
--- a/java/res/drawable-mdpi/sym_keyboard_num7.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num7.png
--- a/java/res/drawable-mdpi/sym_keyboard_num7_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num7_holo.png
--- a/java/res/drawable-mdpi/sym_keyboard_num8.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num8.png
--- a/java/res/drawable-mdpi/sym_keyboard_num8_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num8_holo.png
--- a/java/res/drawable-mdpi/sym_keyboard_num9.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num9.png
--- a/java/res/drawable-mdpi/sym_keyboard_num9_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num9_holo.png
--- a/java/res/drawable-xhdpi/sym_bkeyboard_num0.png
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num0.png
--- a/java/res/drawable-xhdpi/sym_bkeyboard_num1.png
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num1.png
--- a/java/res/drawable-xhdpi/sym_bkeyboard_num2.png
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num2.png
--- a/java/res/drawable-xhdpi/sym_bkeyboard_num3.png
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num3.png
--- a/java/res/drawable-xhdpi/sym_bkeyboard_num4.png
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num4.png
--- a/java/res/drawable-xhdpi/sym_bkeyboard_num5.png
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num5.png
--- a/java/res/drawable-xhdpi/sym_bkeyboard_num6.png
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num6.png
--- a/java/res/drawable-xhdpi/sym_bkeyboard_num7.png
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num7.png
--- a/java/res/drawable-xhdpi/sym_bkeyboard_num8.png
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num8.png
--- a/java/res/drawable-xhdpi/sym_bkeyboard_num9.png
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num9.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num0.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num0.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num0_holo.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num0_holo.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num1.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num1.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num1_holo.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num1_holo.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num2.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num2.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num2_holo.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num2_holo.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num3.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num3.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num3_holo.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num3_holo.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num4.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num4.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num4_holo.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num4_holo.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num5.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num5.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num5_holo.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num5_holo.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num6.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num6.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num6_holo.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num6_holo.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num7.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num7.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num7_holo.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num7_holo.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num8.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num8.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num8_holo.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num8_holo.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num9.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num9.png
--- a/java/res/drawable-xhdpi/sym_keyboard_num9_holo.png
+++ b/java/res/drawable-xhdpi/sym_keyboard_num9_holo.png
--- 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. -->
--- a/Show More
+++ b/Show More