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

Commit f3166e4a authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Update material colors" into lmp-dev

parents fa556209 782ba171

res/layout-sw720dp/activity.xml

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

            android:orientation="vertical"

            android:elevation="8dp"

            android:background="@*android:color/material_grey_50">

            android:background="@color/material_grey_50">



            <com.android.documentsui.DirectoryContainerView

                android:id="@+id/container_directory"
@@ -66,7 +66,7 @@ 
                android:id="@+id/container_save"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="@*android:color/material_grey_50"

                android:background="@color/material_grey_50"

                android:elevation="8dp" />



        </LinearLayout>

res/layout/activity.xml

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="@*android:color/material_grey_50"

            android:background="@color/material_grey_50"

            android:elevation="8dp" />



    </LinearLayout>

res/layout/fragment_directory.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<com.android.documentsui.DirectoryView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@*android:color/material_grey_50">

    android:background="@color/material_grey_50">



    <TextView

        android:id="@android:id/empty"

res/values/colors.xml

+3 −2
Original line number Diff line number Diff line
@@ -15,10 +15,11 @@ 
-->



<resources>

    <color name="material_grey_50">#fffafafa</color>

    <color name="material_grey_300">#ffeeeeee</color>



    <!-- Half-alpha of material_teal_500 -->

    <color name="accent_color_overlay">#8800bcd4</color>



    <color name="grid_item_background">@*android:color/material_grey_300</color>



    <color name="grid_item_background">@color/material_grey_300</color>

</resources>

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


        <item name="android:colorPrimaryDark">@*android:color/material_blue_grey_900</item>

        <item name="android:colorPrimary">@*android:color/material_blue_grey_800</item>

        <item name="android:colorAccent">@*android:color/material_teal_500</item>

        <item name="android:colorAccent">@*android:color/material_deep_teal_500</item>



        <item name="android:windowActionBar">false</item>

        <item name="android:windowNoTitle">true</item>