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

Commit c6e07795 authored by Wenbo Jie (介文博)'s avatar Wenbo Jie (介文博) Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI M3] Update colors for SDK 30 and remove unused colors" into main

parents e6fef1fe 11949690

res/flag(com.android.documentsui.flags.use_material3)/drawable/launcher_screen.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

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

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



  <item

      android:drawable="@drawable/splash_screen"

res/flag(com.android.documentsui.flags.use_material3)/drawable/launcher_screen_night.xml

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >

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



  <item

      android:drawable="@drawable/splash_screen"

      android:height="150dp"

      android:width="150dp"

      android:gravity="center"/>



</layer-list>

res/flag(com.android.documentsui.flags.use_material3)/drawable/list_divider.xml

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
     limitations under the License.

-->



<!-- TODO(b/379776735): remove this file use_material3 flag is launched. -->

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

       android:tint="?android:attr/colorForeground">

    <solid android:color="@color/list_divider_color" />

res/flag(com.android.documentsui.flags.use_material3)/values-night-v31/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
-->



<resources>

  <!-- ?attr/colorSurfaceContainer -->

  <color name="app_background_color">@color/m3_ref_palette_dynamic_neutral_variant12</color>

  <!-- ?attr/colorPrimary -->

  <color name="primary">@android:color/system_accent1_200</color>

  <!-- ?attr/colorSurfaceContainerHigh -->

res/flag(com.android.documentsui.flags.use_material3)/values-night/colors.xml

+2 −6
Original line number Diff line number Diff line
@@ -14,13 +14,11 @@ 
     limitations under the License.

-->

<resources>

    <color name="app_background_color">#202124</color>

    <color name="background_floating">#3C4043</color>

    <!-- ?attr/colorSurfaceContainer -->

    <color name="app_background_color">#211F26</color>



    <!-- ?attr/colorPrimary -->

    <color name="primary">#D0BCFF</color>

    <color name="secondary">#3D8AB4F8</color>

    <color name="hairline">#5F6368</color>



    <color name="success">#3CBA5A</color>

    <color name="on_success">#002110</color>
@@ -42,8 +40,6 @@ 


    <color name="error_image_color">@android:color/white</color>



    <color name="list_divider_color">#9aa0a6</color>



    <!-- ?attr/colorSurfaceContainerHigh -->

    <color name="color_surface_header">#2B2930</color>