diff options
Diffstat (limited to '')
| -rw-r--r-- | java/res/values-land/dimens.xml | 31 | ||||
| -rw-r--r-- | java/res/values-sw600dp-land/dimens.xml | 22 | ||||
| -rw-r--r-- | java/res/values-sw600dp/dimens.xml | 27 | ||||
| -rw-r--r-- | java/res/values-sw768dp-land/dimens.xml | 32 | ||||
| -rw-r--r-- | java/res/values-sw768dp/dimens.xml | 38 | ||||
| -rw-r--r-- | java/res/values/attrs.xml | 7 | ||||
| -rw-r--r-- | java/res/values/dimens.xml | 48 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 18 | ||||
| -rw-r--r-- | java/res/values/styles.xml | 21 | ||||
| -rw-r--r-- | java/res/values/themes-gingerbread.xml | 2 |
10 files changed, 155 insertions, 91 deletions
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml index d6e096278..d5ca25063 100644 --- a/java/res/values-land/dimens.xml +++ b/java/res/values-land/dimens.xml @@ -24,24 +24,33 @@ <fraction name="minKeyboardHeight">45%p</fraction> <!-- key_height + key_bottom_gap = popup_key_height --> <!-- <dimen name="key_height">0.260in</dimen>--> - <dimen name="key_bottom_gap">0.020in</dimen> <dimen name="popup_key_height">0.280in</dimen> - <dimen name="keyboard_top_padding">0.00in</dimen> + <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen> + + <dimen name="keyboard_top_padding">0.02in</dimen> <dimen name="keyboard_bottom_padding">0.00in</dimen> - <dimen name="key_bottom_gap_ics">0.04in</dimen> - <dimen name="key_horizontal_gap_ics">0.01in</dimen> + <dimen name="key_bottom_gap">1.21mm</dimen> + <dimen name="key_horizontal_gap">0.35mm</dimen> + + <dimen name="key_bottom_gap_stone">1.40mm</dimen> + <dimen name="key_horizontal_gap_stone">1.00mm</dimen> + + <dimen name="key_bottom_gap_gb">1.66mm</dimen> + <dimen name="key_horizontal_gap_gb">0.86mm</dimen> + <dimen name="keyboard_top_padding_ics">0.03in</dimen> <dimen name="keyboard_bottom_padding_ics">0.00in</dimen> - <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen> + <dimen name="key_bottom_gap_ics">1.79mm</dimen> + <dimen name="key_horizontal_gap_ics">0.88mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">8dip</dimen> + <dimen name="key_label_horizontal_padding">8dip</dimen> - <fraction name="key_letter_ratio">55%</fraction> - <fraction name="key_large_letter_ratio">68%</fraction> - <fraction name="key_label_ratio">35%</fraction> - <fraction name="key_hint_letter_ratio">28%</fraction> - <fraction name="key_hint_label_ratio">45%</fraction> + <fraction name="key_letter_ratio">65%</fraction> + <fraction name="key_large_letter_ratio">74%</fraction> + <fraction name="key_label_ratio">40%</fraction> + <fraction name="key_hint_letter_ratio">30%</fraction> + <fraction name="key_hint_label_ratio">52%</fraction> <fraction name="key_uppercase_letter_ratio">40%</fraction> <fraction name="key_preview_text_ratio">90%</fraction> <dimen name="key_preview_offset">0.08in</dimen> diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index 5d1fbc748..5016f4247 100644 --- a/java/res/values-sw600dp-land/dimens.xml +++ b/java/res/values-sw600dp-land/dimens.xml @@ -22,20 +22,28 @@ <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 --> <dimen name="keyboardHeight">45.0mm</dimen> <fraction name="minKeyboardHeight">45%p</fraction> - <!-- key_height + key_bottom_gap = popup_key_height --> - <!-- <dimen name="key_height">14.5mm</dimen> --> - <dimen name="key_bottom_gap">1.3mm</dimen> - <dimen name="key_horizontal_gap">1.3mm</dimen> + + <dimen name="keyboard_horizontal_edges_padding">0dp</dimen> <dimen name="keyboard_top_padding">1.1mm</dimen> <dimen name="keyboard_bottom_padding">0.0mm</dimen> - <dimen name="key_bottom_gap_ics">1.3mm</dimen> - <dimen name="key_horizontal_gap_ics">1.3mm</dimen> + <dimen name="key_bottom_gap">2.21mm</dimen> + <dimen name="key_horizontal_gap">1.97mm</dimen> + + <dimen name="key_bottom_gap_stone">1.96mm</dimen> + <dimen name="key_horizontal_gap_stone">2.31mm</dimen> + + <dimen name="key_bottom_gap_gb">2.34mm</dimen> + <dimen name="key_horizontal_gap_gb">2.22mm</dimen> + + <dimen name="key_bottom_gap_ics">1.66mm</dimen> + <dimen name="key_horizontal_gap_ics">1.66mm</dimen> <dimen name="keyboard_top_padding_ics">1.1mm</dimen> <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen> + <dimen name="popup_key_height">13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">18dip</dimen> + <dimen name="key_label_horizontal_padding">18dip</dimen> <fraction name="key_letter_ratio">45%</fraction> <fraction name="key_large_letter_ratio">45%</fraction> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 675f40c2e..1a82b0c6c 100644 --- a/java/res/values-sw600dp/dimens.xml +++ b/java/res/values-sw600dp/dimens.xml @@ -23,18 +23,27 @@ <dimen name="keyboardHeight">48.0mm</dimen> <fraction name="maxKeyboardHeight">50%p</fraction> <fraction name="minKeyboardHeight">-35.0%p</fraction> - <!-- key_height + key_bottom_gap = popup_key_height --> - <!-- <dimen name="key_height">14.5mm</dimen> --> - <dimen name="key_bottom_gap">1.0mm</dimen> - <dimen name="key_horizontal_gap">1.0mm</dimen> + <dimen name="popup_key_height">10.0mm</dimen> + + <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen> <dimen name="keyboard_top_padding">1.1mm</dimen> <dimen name="keyboard_bottom_padding">0.0mm</dimen> - <dimen name="key_bottom_gap_ics">1.0mm</dimen> - <dimen name="key_horizontal_gap_ics">1.0mm</dimen> + <dimen name="key_bottom_gap">1.80mm</dimen> + <dimen name="key_horizontal_gap">1.67mm</dimen> + + <dimen name="key_bottom_gap_stone">1.80mm</dimen> + <dimen name="key_horizontal_gap_stone">1.44mm</dimen> + + <dimen name="key_bottom_gap_gb">2.22mm</dimen> + <dimen name="key_horizontal_gap_gb">1.90mm</dimen> + + <dimen name="key_bottom_gap_ics">1.37mm</dimen> + <dimen name="key_horizontal_gap_ics">1.53mm</dimen> <dimen name="keyboard_top_padding_ics">1.1mm</dimen> <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen> - <dimen name="mini_keyboard_key_horizontal_padding">12dip</dimen> + + <dimen name="mini_keyboard_key_horizontal_padding">6dip</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> <dimen name="mini_keyboard_slide_allowance">15.6mm</dimen> @@ -42,7 +51,9 @@ <dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">6dip</dimen> + <dimen name="key_label_horizontal_padding">6dip</dimen> + <dimen name="key_hint_letter_padding">3dp</dimen> + <dimen name="key_uppercase_letter_padding">3dp</dimen> <fraction name="key_letter_ratio">37%</fraction> <fraction name="key_large_letter_ratio">37%</fraction> diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml index 2201ce8a3..8cbd37e17 100644 --- a/java/res/values-sw768dp-land/dimens.xml +++ b/java/res/values-sw768dp-land/dimens.xml @@ -22,27 +22,35 @@ <!-- keyboardHeight = key_height*4 + key_bottom_gap*3, key_height=14.5mm --> <dimen name="keyboardHeight">58.0mm</dimen> <fraction name="minKeyboardHeight">45%p</fraction> - <!-- key_height + key_bottom_gap = popup_key_height --> - <!-- <dimen name="key_height">14.5mm</dimen> --> - <dimen name="key_bottom_gap">1.6mm</dimen> - <dimen name="key_horizontal_gap">1.6mm</dimen> + + <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen> <dimen name="keyboard_top_padding">1.1mm</dimen> <dimen name="keyboard_bottom_padding">0.0mm</dimen> - <dimen name="key_bottom_gap_ics">1.6mm</dimen> - <dimen name="key_horizontal_gap_ics">1.6mm</dimen> + + <dimen name="key_bottom_gap">2.65mm</dimen> + <dimen name="key_horizontal_gap">2.34mm</dimen> + + <dimen name="key_bottom_gap_stone">1.96mm</dimen> + <dimen name="key_horizontal_gap_stone">2.31mm</dimen> + + <dimen name="key_bottom_gap_gb">2.80mm</dimen> + <dimen name="key_horizontal_gap_gb">2.60mm</dimen> + + <dimen name="key_bottom_gap_ics">2.25mm</dimen> + <dimen name="key_horizontal_gap_ics">2.22mm</dimen> <dimen name="keyboard_top_padding_ics">1.1mm</dimen> <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen> + <dimen name="popup_key_height">13.0mm</dimen> - <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">18dip</dimen> + <dimen name="key_label_horizontal_padding">18dip</dimen> - <fraction name="key_letter_ratio">38%</fraction> - <fraction name="key_large_letter_ratio">38%</fraction> - <fraction name="key_label_ratio">26%</fraction> + <fraction name="key_letter_ratio">43%</fraction> + <fraction name="key_large_letter_ratio">42%</fraction> + <fraction name="key_label_ratio">28%</fraction> <fraction name="key_hint_letter_ratio">23%</fraction> - <fraction name="key_hint_label_ratio">26%</fraction> + <fraction name="key_hint_label_ratio">28%</fraction> <fraction name="key_uppercase_letter_ratio">24%</fraction> <dimen name="key_preview_height">17.0mm</dimen> diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml index 2e41db52a..81a68e233 100644 --- a/java/res/values-sw768dp/dimens.xml +++ b/java/res/values-sw768dp/dimens.xml @@ -23,19 +23,27 @@ <dimen name="keyboardHeight">48.0mm</dimen> <fraction name="maxKeyboardHeight">50%p</fraction> <fraction name="minKeyboardHeight">-35.0%p</fraction> - <!-- key_height + key_bottom_gap = popup_key_height --> - <!-- <dimen name="key_height">14.5mm</dimen> --> - <dimen name="key_bottom_gap">1.1mm</dimen> - <dimen name="key_horizontal_gap">1.1mm</dimen> + + <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen> <dimen name="keyboard_top_padding">1.1mm</dimen> <dimen name="keyboard_bottom_padding">0.0mm</dimen> - <dimen name="key_bottom_gap_ics">1.1mm</dimen> - <dimen name="key_horizontal_gap_ics">1.1mm</dimen> + + <dimen name="key_bottom_gap">2.05mm</dimen> + <dimen name="key_horizontal_gap">2.11mm</dimen> + + <dimen name="key_bottom_gap_stone">1.80mm</dimen> + <dimen name="key_horizontal_gap_stone">1.44mm</dimen> + + <dimen name="key_bottom_gap_gb">2.25mm</dimen> + <dimen name="key_horizontal_gap_gb">1.96mm</dimen> + + <dimen name="key_bottom_gap_ics">1.75mm</dimen> + <dimen name="key_horizontal_gap_ics">1.79mm</dimen> <dimen name="keyboard_top_padding_ics">1.1mm</dimen> <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen> + <dimen name="popup_key_height">10.0mm</dimen> - <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen> - <dimen name="mini_keyboard_horizontal_padding_ics">40dip</dimen> + <dimen name="mini_keyboard_key_horizontal_padding">12dip</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> @@ -44,14 +52,16 @@ <dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen> <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">6dip</dimen> + <dimen name="key_label_horizontal_padding">6dip</dimen> + <dimen name="key_hint_letter_padding">3dp</dimen> + <dimen name="key_uppercase_letter_padding">3dp</dimen> - <fraction name="key_letter_ratio">38%</fraction> - <fraction name="key_large_letter_ratio">38%</fraction> - <fraction name="key_label_ratio">26%</fraction> + <fraction name="key_letter_ratio">40%</fraction> + <fraction name="key_large_letter_ratio">42%</fraction> + <fraction name="key_label_ratio">28%</fraction> <fraction name="key_hint_letter_ratio">23%</fraction> - <fraction name="key_hint_label_ratio">26%</fraction> - <fraction name="key_uppercase_letter_ratio">25%</fraction> + <fraction name="key_hint_label_ratio">28%</fraction> + <fraction name="key_uppercase_letter_ratio">26%</fraction> <fraction name="key_preview_text_ratio">50%</fraction> <dimen name="key_preview_height">15.0mm</dimen> <dimen name="key_preview_offset">0.1in</dimen> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 4470d7b4e..c5897c853 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -51,6 +51,12 @@ <attr name="keyHintLabelRatio" format="float" /> <!-- Size of the text for upper case letter, in the proportion of key height. --> <attr name="keyUppercaseLetterRatio" format="float" /> + <!-- Horizontal padding of left/right aligned key label to the edge of the key. --> + <attr name="keyLabelHorizontalPadding" format="dimension" /> + <!-- Top and right padding of hint letter to the edge of the key.--> + <attr name="keyHintLetterPadding" format="dimension" /> + <!-- Top and right padding of upper case letter to the edge of the key.--> + <attr name="keyUppercaseLetterPadding" format="dimension" /> <!-- Color to use for the label in a key. --> <attr name="keyTextColor" format="color" /> @@ -199,7 +205,6 @@ <!-- This should be aligned with Key.LABEL_OPTION_* --> <flag name="alignLeft" value="0x01" /> <flag name="alignRight" value="0x02" /> - <flag name="alignBottom" value="0x04" /> <flag name="alignLeftOfCenter" value="0x08" /> <flag name="largeLetter" value="0x10" /> <flag name="fontNormal" value="0x20" /> diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml index c1ef86930..36074b3b8 100644 --- a/java/res/values/dimens.xml +++ b/java/res/values/dimens.xml @@ -19,26 +19,33 @@ --> <resources> - <!-- keyboardHeight = key_height*4 + key_bottom_gap*3, key_height=0.295in --> + <!-- keyboardHeight = row_height*4 + key_bottom_gap*3 --> <dimen name="keyboardHeight">1.285in</dimen> <fraction name="maxKeyboardHeight">50%p</fraction> <fraction name="minKeyboardHeight">-61.8%p</fraction> - <!-- key_height + key_bottom_gap = popup_key_height --> - <!-- <dimen name="key_height">0.295in</dimen> --> - <dimen name="key_bottom_gap">0.035in</dimen> - <dimen name="key_horizontal_gap">0.000in</dimen> + <dimen name="popup_key_height">0.330in</dimen> - <dimen name="keyboard_top_padding">0.00in</dimen> - <dimen name="keyboard_bottom_padding">0.06in</dimen> - <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen> - <dimen name="mini_keyboard_horizontal_padding">16dip</dimen> + + <dimen name="mini_keyboard_horizontal_edges_padding">16dip</dimen> <dimen name="mini_keyboard_key_horizontal_padding">8dip</dimen> - <dimen name="key_bottom_gap_ics">0.06in</dimen> - <dimen name="key_horizontal_gap_ics">0.01in</dimen> + <dimen name="keyboard_horizontal_edges_padding">0dp</dimen> + <dimen name="keyboard_top_padding">0.02in</dimen> + <dimen name="keyboard_bottom_padding">0.06in</dimen> + <dimen name="key_bottom_gap">2.04mm</dimen> + <dimen name="key_horizontal_gap">0.70mm</dimen> + + <dimen name="key_bottom_gap_stone">2.45mm</dimen> + <dimen name="key_horizontal_gap_stone">0.90mm</dimen> + + <dimen name="key_bottom_gap_gb">2.12mm</dimen> + <dimen name="key_horizontal_gap_gb">1.02mm</dimen> + <dimen name="keyboard_top_padding_ics">0.03in</dimen> <dimen name="keyboard_bottom_padding_ics">0.06in</dimen> - <dimen name="mini_keyboard_horizontal_padding_ics">38dip</dimen> + <dimen name="mini_keyboard_horizontal_edges_padding_ics">6dp</dimen> + <dimen name="key_bottom_gap_ics">2.37mm</dimen> + <dimen name="key_horizontal_gap_ics">0.90mm</dimen> <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. --> <!-- popup_key_height x 1.2 --> @@ -49,19 +56,20 @@ to user's finger. --> <dimen name="keyboard_vertical_correction">-0.05in</dimen> - <!-- left or right padding of label alignment --> - <dimen name="key_label_horizontal_alignment_padding">4dip</dimen> - - <fraction name="key_letter_ratio">45%</fraction> - <fraction name="key_large_letter_ratio">55%</fraction> - <fraction name="key_label_ratio">29%</fraction> - <fraction name="key_hint_letter_ratio">23%</fraction> - <fraction name="key_hint_label_ratio">36%</fraction> + <fraction name="key_letter_ratio">55%</fraction> + <fraction name="key_large_letter_ratio">65%</fraction> + <fraction name="key_label_ratio">34%</fraction> + <fraction name="key_hint_letter_ratio">25%</fraction> + <fraction name="key_hint_label_ratio">44%</fraction> <fraction name="key_uppercase_letter_ratio">35%</fraction> <fraction name="key_preview_text_ratio">82%</fraction> <dimen name="key_preview_height">80sp</dimen> <dimen name="key_preview_offset">0.1in</dimen> + <dimen name="key_label_horizontal_padding">4dip</dimen> + <dimen name="key_hint_letter_padding">2dp</dimen> + <dimen name="key_uppercase_letter_padding">2dp</dimen> + <dimen name="key_preview_height_ics">80sp</dimen> <dimen name="key_preview_offset_ics">0.05in</dimen> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index a6ef5e533..f7d43f24a 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -190,25 +190,25 @@ <string name="spoken_description_double_quote">Double quote</string> <!-- Spoken description for the "'" keyboard key. --> <string name="spoken_description_single_quote">Single quote</string> - <!-- Spoken description for the "•" keyboard key. --> + <!-- Spoken description for the "\u2022" (BULLET) keyboard key. --> <string name="spoken_description_dot">Dot</string> - <!-- Spoken description for the "√" keyboard key. --> + <!-- Spoken description for the "\u221a" (SQUARE ROOT) keyboard key. --> <string name="spoken_description_square_root">Square root</string> - <!-- Spoken description for the "π" keyboard key. --> + <!-- Spoken description for the "\u03C0" (GREEK SMALL LETTER PI) keyboard key. --> <string name="spoken_description_pi">Pi</string> - <!-- Spoken description for the "Δ" keyboard key. --> + <!-- Spoken description for the "\u0394" (GREEK CAPITAL LETTER DELTA) keyboard key. --> <string name="spoken_description_delta">Delta</string> - <!-- Spoken description for the "™" keyboard key. --> + <!-- Spoken description for the "\u2122" (TRADE MARK SIGN) keyboard key. --> <string name="spoken_description_trademark">Trademark</string> - <!-- Spoken description for the "℅" keyboard key. --> + <!-- Spoken description for the "\u2105" (CARE OF) keyboard key. --> <string name="spoken_description_care_of">Care of</string> <!-- Spoken description for the "*" keyboard key. --> <string name="spoken_description_star">Star</string> <!-- Spoken description for the "#" keyboard key. --> <string name="spoken_description_pound">Pound</string> - <!-- Spoken description for the "…" keyboard key. --> + <!-- Spoken description for the "\u2026" (HORIZONTAL ELLIPSIS) keyboard key. --> <string name="spoken_description_ellipsis">Ellipsis</string> - <!-- Spoken description for the "„" keyboard key. --> + <!-- Spoken description for the "\u201E" (DOUBLE LOW-9 QUOTATION MARK) keyboard key. --> <string name="spoken_description_low_double_quote">Low double quote</string> <!-- Voice related labels --> @@ -303,8 +303,6 @@ <!-- Title for input language selection screen --> <string name="language_selection_title">Input languages</string> - <!-- Title summary for input language selection screen --> - <string name="language_selection_summary">Slide finger on spacebar to change language</string> <!-- Add to dictionary hint --> <string name="hint_add_to_dictionary">\u2190 Touch again to save</string> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 08301be5c..29b9d589c 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -49,6 +49,9 @@ <item name="keyHintLabelColor">#E0E0E4E5</item> <item name="keyUppercaseLetterInactivatedColor">#66E0E4E5</item> <item name="keyUppercaseLetterActivatedColor">#CCE0E4E5</item> + <item name="keyLabelHorizontalPadding">@dimen/key_label_horizontal_padding</item> + <item name="keyHintLetterPadding">@dimen/key_hint_letter_padding</item> + <item name="keyUppercaseLetterPadding">@dimen/key_uppercase_letter_padding</item> <item name="keyPreviewLayout">@layout/key_preview</item> <item name="keyPreviewBackground">@drawable/keyboard_key_feedback</item> <item name="keyPreviewLeftBackground">@null</item> @@ -72,8 +75,8 @@ </style> <style name="PopupMiniKeyboardPanelStyle"> <item name="android:background">@drawable/keyboard_popup_panel_background</item> - <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_padding</item> - <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_padding</item> + <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding</item> + <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding</item> </style> <style name="SuggestionsStripBackgroundStyle"> <item name="android:background">@drawable/keyboard_suggest_strip</item> @@ -99,8 +102,8 @@ </style> <!-- Theme "Stone" --> <style name="Keyboard.Stone" parent="Keyboard"> - <item name="horizontalGap">@dimen/key_horizontal_gap</item> - <item name="verticalGap">@dimen/key_bottom_gap</item> + <item name="horizontalGap">@dimen/key_horizontal_gap_stone</item> + <item name="verticalGap">@dimen/key_bottom_gap_stone</item> </style> <style name="LatinKeyboard.Stone" parent="LatinKeyboard"> <item name="spacebarTextColor">#FF000000</item> @@ -126,6 +129,10 @@ <item name="keyTextStyle">bold</item> </style> <!-- Theme "Gingerbread" --> + <style name="Keyboard.Gingerbread" parent="Keyboard"> + <item name="horizontalGap">@dimen/key_horizontal_gap_gb</item> + <item name="verticalGap">@dimen/key_bottom_gap_gb</item> + </style> <style name="KeyboardView.Gingerbread" parent="KeyboardView"> <item name="android:background">@drawable/keyboard_dark_background</item> <item name="keyBackground">@drawable/btn_keyboard_key_gingerbread</item> @@ -168,9 +175,9 @@ <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item> </style> <style name="PopupMiniKeyboardPanelStyle.IceCreamSandwich"> - <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item> - <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_padding_ics</item> - <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_padding_ics</item> + <item name="android:background">@drawable/btn_keyboard_key_popup_background_holo</item> + <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_edges_padding_ics</item> + <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_edges_padding_ics</item> </style> <style name="SuggestionsStripBackgroundStyle.IceCreamSandwich"> <item name="android:background">@drawable/keyboard_suggest_strip_holo</item> diff --git a/java/res/values/themes-gingerbread.xml b/java/res/values/themes-gingerbread.xml index 091baa737..60f226153 100644 --- a/java/res/values/themes-gingerbread.xml +++ b/java/res/values/themes-gingerbread.xml @@ -16,7 +16,7 @@ <resources> <style name="KeyboardTheme.Gingerbread" parent="KeyboardIcons"> - <item name="keyboardStyle">@style/Keyboard</item> + <item name="keyboardStyle">@style/Keyboard.Gingerbread</item> <item name="latinKeyboardStyle">@style/LatinKeyboard</item> <item name="keyboardViewStyle">@style/KeyboardView.Gingerbread</item> <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.Gingerbread</item> |