Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d99a2ed authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Make KeyboardView style as a parent of SuggestionStripView style 

With this CL, SuggestionStripView can refer an icon asset in a
keyboard theme.

Bug: 14419121
Change-Id: I30d595c08ce02b8c7d3f111e1edab2820c0b602e
parent 04348c36

java/res/values/themes-common.xml

+1 −6
Original line number Diff line number Diff line
@@ -120,12 +120,7 @@ 
        name="MoreKeysKeyboardView"

        parent="MainKeyboardView" />

    <style name="MoreKeysKeyboardContainer" />

    <style name="SuggestionStripView">

        <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>

        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>

        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>

        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>

    </style>

    <style name="SuggestionStripView" />

    <style name="SuggestionWord">

        <item name="android:minWidth">@dimen/config_suggestion_min_width</item>

        <item name="android:textSize">@dimen/config_suggestion_text_size</item>

java/res/values/themes-ics.xml

+5 −1
Original line number Diff line number Diff line
@@ -109,8 +109,12 @@ 
    </style>

    <style

        name="SuggestionStripView.ICS"

        parent="SuggestionStripView"

        parent="KeyboardView.ICS"

    >

        <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>

        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>

        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>

        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>

        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>

        <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>

        <item name="colorValidTypedWord">@color/typed_word_color_ics</item>

java/res/values/themes-klp.xml

+5 −1
Original line number Diff line number Diff line
@@ -109,8 +109,12 @@ 
    </style>

    <style

        name="SuggestionStripView.KLP"

        parent="SuggestionStripView"

        parent="KeyboardView.KLP"

    >

        <item name="suggestionsCountInStrip">@integer/config_suggestions_count_in_strip</item>

        <item name="centerSuggestionPercentile">@fraction/config_center_suggestion_percentile</item>

        <item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>

        <item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>

        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>

        <item name="suggestionStripOptions">autoCorrectBold|validTypedWordBold</item>

        <item name="colorValidTypedWord">@color/typed_word_color_klp</item>