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

Commit 0e2fa661 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Rename suggestionsPaneViewStyle to moreSuggestionsViewStyle 

Change-Id: I30873ad870c728e28a044baf9946b4461ab03575
parent 59b501a0

java/res/values/attrs.xml

+3 −3
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ 
        <attr name="miniKeyboardPanelStyle" format="reference" />

        <!-- Suggestions strip style -->

        <attr name="suggestionsStripBackgroundStyle" format="reference" />

        <attr name="suggestionsPaneViewStyle" format="reference" />

        <attr name="suggestionsViewStyle" format="reference" />

        <attr name="moreSuggestionsViewStyle" format="reference" />

        <attr name="suggestionBackgroundStyle" format="reference" />

        <attr name="suggestionPreviewBackgroundStyle" format="reference" />

        <attr name="suggestionsViewStyle" format="reference" />

        </declare-styleable>



    <declare-styleable name="KeyboardView">

java/res/values/styles.xml

+24 −24
Original line number Diff line number Diff line
@@ -79,20 +79,9 @@ 
        <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="SuggestionsPaneViewStyle"

        parent="MiniKeyboardView"

    >

    </style>

    <style name="SuggestionsStripBackgroundStyle">

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

    </style>

    <style name="SuggestionBackgroundStyle">

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

    </style>

    <style name="SuggestionPreviewBackgroundStyle">

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

    </style>

    <style

        name="SuggestionsViewStyle"

        parent="SuggestionsStripBackgroundStyle"
@@ -104,6 +93,17 @@ 
        <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item>

        <item name="centerSuggestionPercentile">@integer/center_suggestion_percentile</item>

    </style>

    <style

        name="MoreSuggestionsViewStyle"

        parent="MiniKeyboardView"

    >

    </style>

    <style name="SuggestionBackgroundStyle">

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

    </style>

    <style name="SuggestionPreviewBackgroundStyle">

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

    </style>

    <!-- Theme "Basic high contrast" -->

    <style

        name="KeyboardView.HighContrast"
@@ -232,19 +232,6 @@ 
    <style name="SuggestionsStripBackgroundStyle.IceCreamSandwich">

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

    </style>

    <style name="SuggestionBackgroundStyle.IceCreamSandwich">

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

    </style>

    <style

        name="SuggestionPreviewBackgroundStyle.IceCreamSandwich"

        parent="MiniKeyboardPanelStyle.IceCreamSandwich"

    >

    </style>

    <style

        name="SuggestionsPaneViewStyle.IceCreamSandwich"

        parent="MiniKeyboardView.IceCreamSandwich"

    >

    </style>

    <style

        name="SuggestionsViewStyle.IceCreamSandwich"

        parent="SuggestionsStripBackgroundStyle.IceCreamSandwich"
@@ -256,6 +243,19 @@ 
        <item name="suggestionsCountInStrip">@integer/suggestions_count_in_strip</item>

        <item name="centerSuggestionPercentile">@integer/center_suggestion_percentile</item>

    </style>

    <style

        name="MoreSuggestionsViewStyle.IceCreamSandwich"

        parent="MiniKeyboardView.IceCreamSandwich"

    >

    </style>

    <style name="SuggestionBackgroundStyle.IceCreamSandwich">

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

    </style>

    <style

        name="SuggestionPreviewBackgroundStyle.IceCreamSandwich"

        parent="MiniKeyboardPanelStyle.IceCreamSandwich"

    >

    </style>

    <style name="MiniKeyboardAnimation">

        <item name="android:windowEnterAnimation">@anim/mini_keyboard_fadein</item>

        <item name="android:windowExitAnimation">@anim/mini_keyboard_fadeout</item>

java/res/values/themes-basic-highcontrast.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
        <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item>

        <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>

        <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>

        <item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item>

        <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>

        <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>

        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>

        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

        <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>

    </style>

</resources>

java/res/values/themes-basic.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
        <item name="miniKeyboardViewStyle">@style/MiniKeyboardView</item>

        <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>

        <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>

        <item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item>

        <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>

        <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>

        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>

        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

        <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>

    </style>

</resources>

java/res/values/themes-gingerbread.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
        <item name="miniKeyboardViewStyle">@style/MiniKeyboardView.Gingerbread</item>

        <item name="miniKeyboardPanelStyle">@style/MiniKeyboardPanelStyle</item>

        <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle</item>

        <item name="suggestionsPaneViewStyle">@style/SuggestionsPaneViewStyle</item>

        <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>

        <item name="moreSuggestionsViewStyle">@style/MoreSuggestionsViewStyle</item>

        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle</item>

        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle</item>

        <item name="suggestionsViewStyle">@style/SuggestionsViewStyle</item>

    </style>

</resources>