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

Commit daab5caf authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary suggestion strip container"

parents e482cd8e 52d220e7

java/res/layout/input_view.xml

+10 −27
Original line number Diff line number Diff line
@@ -30,34 +30,17 @@ 
        android:layout_width="match_parent"

        android:layout_height="0dp" />



    <!-- On tablets, the suggestions strip is centered with horizontal paddings on both sides

         because width of the landscape mode is too long for the suggestions strip. This

         LinearLayout is required to hold the paddings. -->

    <LinearLayout

        android:id="@+id/suggestions_container"

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

    >

        <View

            android:layout_width="@dimen/suggestions_strip_padding"

            android:layout_height="@dimen/suggestions_strip_height"

            style="?attr/suggestionsStripBackgroundStyle" />

    <!-- To ensure that key preview popup is correctly placed when the current system locale is

         one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->

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

        android:id="@+id/suggestion_strip_view"

        android:layoutDirection="ltr"

            android:layout_weight="1.0"

            android:layout_width="0dp"

        android:layout_width="match_parent"

        android:layout_height="@dimen/suggestions_strip_height"

        android:gravity="center_vertical"

        android:paddingRight="@dimen/suggestions_strip_padding"

        android:paddingLeft="@dimen/suggestions_strip_padding"

        style="?attr/suggestionStripViewStyle" />

        <View

            android:layout_width="@dimen/suggestions_strip_padding"

            android:layout_height="@dimen/suggestions_strip_height"

            style="?attr/suggestionsStripBackgroundStyle" />

    </LinearLayout>



    <!-- To ensure that key preview popup is correctly placed when the current system locale is

         one of RTL locales, layoutDirection="ltr" is needed in the SDK version 17+. -->

java/res/values/attrs.xml

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
        <attr name="moreKeysKeyboardViewStyle" format="reference" />

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

        <!-- Suggestions strip style -->

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

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

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

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

java/res/values/styles.xml

+2 −8
Original line number Diff line number Diff line
@@ -145,13 +145,10 @@ 
    <style name="MoreKeysKeyboardPanelStyle">

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

    </style>

    <style name="SuggestionsStripBackgroundStyle">

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

    </style>

    <style

        name="SuggestionStripViewStyle"

        parent="SuggestionsStripBackgroundStyle"

    >

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

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

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

        <item name="colorTypedWord">@color/typed_word_color_default</item>
@@ -380,13 +377,10 @@ 
    <style name="MoreKeysKeyboardPanelStyle.IceCreamSandwich">

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

    </style>

    <style name="SuggestionsStripBackgroundStyle.IceCreamSandwich">

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

    </style>

    <style

        name="SuggestionStripViewStyle.IceCreamSandwich"

        parent="SuggestionsStripBackgroundStyle.IceCreamSandwich"

    >

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

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

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

        <item name="colorTypedWord">@color/highlight_color_ics</item>

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

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard</item>

        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView</item>

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

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

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

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

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

java/res/values/themes-basic.xml

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
        <item name="moreKeysKeyboardStyle">@style/MoreKeysKeyboard</item>

        <item name="moreKeysKeyboardViewStyle">@style/MoreKeysKeyboardView</item>

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

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

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

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

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