Merge "Remove 7inch dedicated icons"

2011-08-22 03:35:03 -07:00 · 2011-08-22 03:35:03 -07:00 · 450f1c068d
parent 9f31575045 320346f001
commit 450f1c068d
39 changed files with 6 additions and 13 deletions
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_delete_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_delete_holo.png
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_return_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_return_holo.png
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_search_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_search_holo.png
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_settings_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_settings_holo.png
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_holo.png
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_locked_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_locked_holo.png
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_smiley_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_smiley_holo.png
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_space_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_space_holo.png
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_holo.png
--- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_off_holo.png
+++ b/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_off_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_search_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_search_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_smiley_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_smiley_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png
--- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png
+++ b/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_delete_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_delete_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_return_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_return_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_search_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_search_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_settings_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_settings_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_locked_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_locked_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_smiley_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_smiley_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_space_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_space_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_holo.png
--- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_off_holo.png
+++ b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_off_holo.png
--- a/java/res/values-sw600dp-land/dimens.xml
+++ b/java/res/values-sw600dp-land/dimens.xml
@ -44,7 +44,7 @@
    <dimen name="key_label_horizontal_padding">18dip</dimen>

    <fraction name="key_letter_ratio">45%</fraction>
-    <fraction name="key_large_letter_ratio">45%</fraction>
+    <fraction name="key_large_letter_ratio">48%</fraction>
    <fraction name="key_label_ratio">32%</fraction>
    <fraction name="key_hint_letter_ratio">23%</fraction>
    <fraction name="key_hint_label_ratio">34%</fraction>
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-sw600dp/dimens.xml
@ -53,12 +53,12 @@
    <dimen name="key_hint_letter_padding">3dp</dimen>
    <dimen name="key_uppercase_letter_padding">3dp</dimen>

-    <fraction name="key_letter_ratio">37%</fraction>
-    <fraction name="key_large_letter_ratio">37%</fraction>
-    <fraction name="key_label_ratio">22%</fraction>
+    <fraction name="key_letter_ratio">42%</fraction>
+    <fraction name="key_large_letter_ratio">45%</fraction>
+    <fraction name="key_label_ratio">25%</fraction>
    <fraction name="key_hint_letter_ratio">23%</fraction>
-    <fraction name="key_hint_label_ratio">26%</fraction>
-    <fraction name="key_uppercase_letter_ratio">25%</fraction>
+    <fraction name="key_hint_label_ratio">28%</fraction>
+    <fraction name="key_uppercase_letter_ratio">26%</fraction>
    <fraction name="key_preview_text_ratio">50%</fraction>
    <dimen name="key_preview_height">15.0mm</dimen>
    <dimen name="key_preview_offset">0.1in</dimen>
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/kbd_key_styles.xml
@ -96,25 +96,21 @@
        latin:styleName="toSymbolKeyStyle"
        latin:code="@integer/key_switch_alpha_symbol"
        latin:keyLabel="@string/label_to_symbol_key"
-        latin:keyLabelOption="fontNormal"
        latin:parentStyle="functionalKeyStyle" />
    <key-style
        latin:styleName="toAlphaKeyStyle"
        latin:code="@integer/key_switch_alpha_symbol"
        latin:keyLabel="@string/label_to_alpha_key"
-        latin:keyLabelOption="fontNormal"
        latin:parentStyle="functionalKeyStyle" />
    <key-style
        latin:styleName="toMoreSymbolKeyStyle"
        latin:code="@integer/key_shift"
        latin:keyLabel="@string/label_to_more_symbol_for_tablet_key"
-        latin:keyLabelOption="fontNormal"
        latin:parentStyle="functionalKeyStyle" />
    <key-style
        latin:styleName="backFromMoreSymbolKeyStyle"
        latin:code="@integer/key_shift"
        latin:keyLabel="@string/label_to_symbol_key"
-        latin:keyLabelOption="fontNormal"
        latin:parentStyle="functionalKeyStyle" />
    <key-style
        latin:styleName="comKeyStyle"
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
@ -26,7 +26,6 @@
    >
        <Key
            latin:keyStyle="toSymbolKeyStyle"
-            latin:keyLabelOption="alignLeft"
            latin:keyWidth="13.0%p" />
        <Key
            latin:keyStyle="tabKeyStyle" />
--- a/java/res/xml-sw600dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_rows_symbols.xml
@ -147,7 +147,6 @@
    >
        <Key
            latin:keyStyle="toAlphaKeyStyle"
-            latin:keyLabelOption="alignLeft"
            latin:keyWidth="13.0%p" />
        <Key
            latin:keyStyle="tabKeyStyle" />
--- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
@ -133,7 +133,6 @@
    >
        <Key
            latin:keyStyle="toAlphaKeyStyle"
-            latin:keyLabelOption="alignLeft"
            latin:keyWidth="13.0%p" />
        <Key
            latin:keyStyle="tabKeyStyle" />