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

Commit 237260df authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Use colorPrimary for search bar and suggestion background" into pi-dev 

am: a6b773a3

Change-Id: I7780d9b56be0839df3ecd0b9ef74aff3ee29fdc1
parents 7746cd94 a6b773a3

res/layout/settings_main_dashboard.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        android:id="@+id/search_bar_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/suggestion_condition_background">

        android:background="?android:attr/colorPrimary">

        <android.support.v7.widget.CardView

            android:id="@+id/search_bar"

            android:layout_width="match_parent"

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ 
    </style>



    <style name="SuggestionConditionStyle">

        <item name="android:background">@color/suggestion_condition_background</item>

        <item name="android:background">?android:attr/colorPrimary</item>

    </style>



    <style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">