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

Commit 08a6f2ae authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Make CandidateView aware of theme 

This change is needed to introduce new theme easily.

Bug: 4436327
Change-Id: Idc368b66d892d9c888ba7a26bfa3527c21678292
parent 66bafe24

java/res/layout/candidates_strip.xml

+3 −5
Original line number Diff line number Diff line
@@ -42,20 +42,18 @@ 
        <include

            android:id="@+id/candidate_right"

            layout="@layout/candidate" />

        <!-- TODO: These images' drawable must be determined depending on theme. -->

        <!-- Image drawables are set in CandidateView constructor -->

        <ImageButton

            android:id="@+id/expand_candidates_pane"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@drawable/btn_expand_candidates_pane"

            android:visibility="gone"

            style="?attr/suggestionBackgroundStyle" />

            style="?attr/suggestionsStripBackgroundStyle" />

        <ImageButton

            android:id="@+id/close_candidates_pane"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@drawable/btn_close_candidates_pane"

            android:visibility="gone"

            style="?attr/suggestionBackgroundStyle" />

            style="?attr/suggestionsStripBackgroundStyle" />

    </LinearLayout>

</merge>

java/res/layout/input_view.xml

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ 
            android:layout_weight="1.0"

            android:layout_width="0dp"

            android:layout_height="@dimen/candidate_strip_height"

            android:gravity="center_vertical"

            style="?attr/suggestionsStripBackgroundStyle" />

            android:gravity="center_vertical" />

        <View

            android:layout_width="@dimen/candidate_strip_padding"

            android:layout_height="@dimen/candidate_strip_height"

java/res/values-sw600dp/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
    <bool name="config_enable_show_recorrection_option">false</bool>

    <bool name="config_enable_quick_fixes_option">false</bool>

    <bool name="config_enable_bigram_suggestions_option">false</bool>

    <bool name="config_candidate_highlight_font_color_enabled">false</bool>

    <bool name="config_swipe_down_dismiss_keyboard_enabled">false</bool>

    <bool name="config_sliding_key_input_enabled">false</bool>

    <bool name="config_digit_popup_characters_enabled">false</bool>

java/res/values-sw768dp/config.xml

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
    <bool name="config_enable_show_recorrection_option">false</bool>

    <bool name="config_enable_quick_fixes_option">false</bool>

    <bool name="config_enable_bigram_suggestions_option">false</bool>

    <bool name="config_candidate_highlight_font_color_enabled">false</bool>

    <bool name="config_swipe_down_dismiss_keyboard_enabled">false</bool>

    <bool name="config_sliding_key_input_enabled">false</bool>

    <bool name="config_digit_popup_characters_enabled">false</bool>

java/res/values/attrs.xml

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

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

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

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

    </declare-styleable>



    <declare-styleable name="KeyboardView">
@@ -88,6 +89,20 @@ 


    </declare-styleable>



    <declare-styleable name="CandidateView">

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

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

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

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

            <flag name="autoCorrectSpacebarLed" value="0x08" />

        </attr>

        <attr name="colorTypedWord" format="color" />

        <attr name="colorAutoCorrect" format="color" />

        <attr name="colorSuggested" format="color" />

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

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

    </declare-styleable>



    <declare-styleable name="Keyboard">

        <!-- Default keyboard height -->

        <attr name="keyboardHeight" format="dimension" />