diff options
Diffstat (limited to 'java/res')
41 files changed, 13 insertions, 19 deletions
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_delete_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_delete_holo.png Binary files differdeleted file mode 100644 index 223fcfb3a..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_delete_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_return_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_return_holo.png Binary files differdeleted file mode 100644 index c9d3d749b..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_return_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_search_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_search_holo.png Binary files differdeleted file mode 100644 index 5ed614a59..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_search_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_settings_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_settings_holo.png Binary files differdeleted file mode 100644 index 00168b272..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_settings_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_holo.png Binary files differdeleted file mode 100644 index 980547e37..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_locked_holo.png Binary files differdeleted file mode 100644 index 868eec332..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_locked_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_smiley_holo.png Binary files differdeleted file mode 100644 index 27d2b7d1b..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_smiley_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_space_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_space_holo.png Binary files differdeleted file mode 100644 index d89bddae9..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_space_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png Binary files differdeleted file mode 100644 index e11d854e4..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_holo.png Binary files differdeleted file mode 100644 index 0eb4aa244..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_off_holo.png Binary files differdeleted file mode 100644 index b53456a99..000000000 --- a/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_off_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png Binary files differdeleted file mode 100644 index 66111eefa..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png Binary files differdeleted file mode 100644 index 5420161b7..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_search_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_search_holo.png Binary files differdeleted file mode 100644 index 182133727..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_search_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png Binary files differdeleted file mode 100644 index 3c8166682..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png Binary files differdeleted file mode 100644 index 6e3d718b2..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png Binary files differdeleted file mode 100644 index ea2f0e967..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_smiley_holo.png Binary files differdeleted file mode 100644 index 9c08b5a17..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_smiley_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png Binary files differdeleted file mode 100644 index dac90bb87..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png Binary files differdeleted file mode 100644 index 79f3735ef..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png Binary files differdeleted file mode 100644 index b1678f03e..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png Binary files differdeleted file mode 100644 index 58142fa6d..000000000 --- a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_delete_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_delete_holo.png Binary files differdeleted file mode 100644 index df64bbe9b..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_delete_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_return_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_return_holo.png Binary files differdeleted file mode 100644 index 13f78c480..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_return_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_search_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_search_holo.png Binary files differdeleted file mode 100644 index 7e0f1ae07..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_search_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_settings_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_settings_holo.png Binary files differdeleted file mode 100644 index 8c1395edf..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_settings_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_holo.png Binary files differdeleted file mode 100644 index a4068eae4..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_locked_holo.png Binary files differdeleted file mode 100644 index 4cb37cdfc..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_locked_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_smiley_holo.png Binary files differdeleted file mode 100644 index 481d889ab..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_smiley_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_space_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_space_holo.png Binary files differdeleted file mode 100644 index 4bfbf6651..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_space_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png Binary files differdeleted file mode 100644 index 1ea57c5cb..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_holo.png Binary files differdeleted file mode 100644 index 597be7d92..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_holo.png +++ /dev/null diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_off_holo.png Binary files differdeleted file mode 100644 index 58fd48b4a..000000000 --- a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_off_holo.png +++ /dev/null diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml index c75fcc0d1..1d26338c5 100644 --- 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> diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml index 20876a202..942bc726f 100644 --- 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> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index 172ca2f25..4cabe93a8 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -107,10 +107,11 @@ </declare-styleable> <declare-styleable name="CandidateView"> - <attr name="autoCorrectHighlight" format="integer"> + <attr name="suggestionStripOption" format="integer"> <flag name="autoCorrectBold" value="0x01" /> <flag name="autoCorrectUnderline" value="0x02" /> <flag name="autoCorrectInvert" value="0x04" /> + <flag name="validTypedWordBold" value="0x08" /> </attr> <attr name="colorTypedWord" format="color" /> <attr name="colorAutoCorrect" format="color" /> diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml index 8145d0510..cb9edb0b8 100644 --- a/java/res/values/styles.xml +++ b/java/res/values/styles.xml @@ -85,7 +85,7 @@ <item name="android:background">@drawable/candidate_feedback_background</item> </style> <style name="CandidateViewStyle" parent="SuggestionsStripBackgroundStyle"> - <item name="autoCorrectHighlight">autoCorrectBold</item> + <item name="suggestionStripOption">autoCorrectBold</item> <item name="colorTypedWord">#FFFFFFFF</item> <item name="colorAutoCorrect">#FFFCAE00</item> <item name="colorSuggested">#FFFCAE00</item> @@ -188,10 +188,10 @@ <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item> </style> <style name="CandidateViewStyle.IceCreamSandwich" parent="SuggestionsStripBackgroundStyle.IceCreamSandwich"> - <item name="autoCorrectHighlight">autoCorrectBold</item> - <item name="colorTypedWord">#FFFFFFFF</item> - <item name="colorAutoCorrect">#FF3DC8FF</item> - <item name="colorSuggested">#FFFFFFFF</item> + <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item> + <item name="colorTypedWord">#FFBCBEC0</item> + <item name="colorAutoCorrect">#FF0099CC</item> + <item name="colorSuggested">#FFA7A9AC</item> <item name="candidateCountInStrip">@integer/candidate_count_in_strip</item> <item name="centerCandidatePercentile">@integer/center_candidate_percentile</item> </style> diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index 05b683707..15a3d1df5 100644 --- 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" diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml index f22b69f73..4c978cb2c 100644 --- 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" /> diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/kbd_rows_symbols.xml index 4f6a9bc31..420e46cce 100644 --- 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" /> diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml index 1dca8c47e..2909acb6f 100644 --- 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" /> |
