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

Commit 0ff13a49 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Remove hardcoded color for settings dashboard"

parents e02d17ac 9d690bdb

res/drawable/selectable_card.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
<ripple

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:attr/colorControlHighlight">

    <item android:drawable="@color/card_background"/>

    <item android:drawable="?android:attr/colorBackground"/>

</ripple>
 
 No newline at end of file

res/drawable/selectable_card_grey.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ 
<ripple

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:attr/colorControlHighlight">

    <item android:drawable="@color/card_background_grey"/>

    <item android:drawable="?android:attr/colorSecondary"/>

</ripple>

res/layout/dashboard_category.xml

+1 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 
    android:layout_width="match_parent"

    android:layout_height="@dimen/dashboard_category_height"

    android:orientation="vertical"

    android:paddingBottom="8dip"

    android:background="@color/card_background">

    android:paddingBottom="8dip">



    <TextView android:id="@android:id/title"

        android:layout_width="match_parent"

res/layout/dashboard_spacer.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="8dp"

    android:background="@color/card_background_grey"/>
 
    android:background="?android:attr/colorSecondary"/>

res/layout/support_fragment.xml

+1 −2
Original line number Diff line number Diff line
@@ -27,6 +27,5 @@ 
    <android.support.v7.widget.RecyclerView

        android:id="@+id/support_items"

        android:layout_height="match_parent"

        android:layout_width="match_parent"

        android:background="@color/card_background"/>

        android:layout_width="match_parent"/>

</FrameLayout>