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

Commit 4702671e authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Rename SuggestionsView to SuggestionStripView

parent c8e45ddb

java/res/layout/input_view.xml

+3 −3
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ 
            android:layout_width="@dimen/suggestions_strip_padding"

            android:layout_height="@dimen/suggestions_strip_height"

            style="?attr/suggestionsStripBackgroundStyle" />

        <com.android.inputmethod.latin.suggestions.SuggestionsView

            android:id="@+id/suggestions_view"

        <com.android.inputmethod.latin.suggestions.SuggestionStripView

            android:id="@+id/suggestion_strip_view"

            android:layout_weight="1.0"

            android:layout_width="0dp"

            android:layout_height="@dimen/suggestions_strip_height"

            android:gravity="center_vertical"

            style="?attr/suggestionsViewStyle" />

            style="?attr/suggestionStripViewStyle" />

        <View

            android:layout_width="@dimen/suggestions_strip_padding"

            android:layout_height="@dimen/suggestions_strip_height"

java/res/values/attrs.xml

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        <attr name="moreKeysKeyboardPanelStyle" format="reference" />

        <!-- Suggestions strip style -->

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

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

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

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

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

        <attr name="suggestionPreviewBackgroundStyle" format="reference" />
@@ -155,9 +155,9 @@ 
        <attr name="showMoreKeysKeyboardAtTouchedPoint" format="boolean" />

    </declare-styleable>



    <declare-styleable name="SuggestionsView">

    <declare-styleable name="SuggestionStripView">

        <attr name="suggestionStripOption" format="integer">

            <!-- This should be aligned with SuggestionsViewParams.AUTO_CORRECT_* and etc. -->

            <!-- This should be aligned with SuggestionStripViewParams.AUTO_CORRECT_* and etc. -->

            <flag name="autoCorrectBold" value="0x01" />

            <flag name="autoCorrectUnderline" value="0x02" />

            <flag name="validTypedWordBold" value="0x04" />

java/res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ 
        <item name="android:background">@drawable/keyboard_suggest_strip</item>

    </style>

    <style

        name="SuggestionsViewStyle"

        name="SuggestionStripViewStyle"

        parent="SuggestionsStripBackgroundStyle"

    >

        <item name="suggestionStripOption">autoCorrectBold|validTypedWordBold</item>
@@ -348,7 +348,7 @@ 
        <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>

    </style>

    <style

        name="SuggestionsViewStyle.IceCreamSandwich"

        name="SuggestionStripViewStyle.IceCreamSandwich"

        parent="SuggestionsStripBackgroundStyle.IceCreamSandwich"

    >

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

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView</item>

        <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item>

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

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

        <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item>

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

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

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

java/res/values/themes-basic.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView</item>

        <item name="moreKeysKeyboardPanelStyle">@style/MoreKeysKeyboardPanelStyle</item>

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

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

        <item name="suggestionStripViewStyle">@style/SuggestionStripViewStyle</item>

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

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

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