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

Commit 8b9365d4 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Apply new color scheme" into sc-dev

parents 93e1e566 554a1bee

res/values-v31/colors.xml

+11 −11
Original line number Diff line number Diff line
@@ -17,17 +17,17 @@ 
*/

-->

<resources>

    <color name="popup_color_primary_light">@android:color/system_primary_50</color>

    <color name="popup_color_secondary_light">@android:color/system_primary_100</color>

    <color name="popup_color_tertiary_light">@android:color/system_primary_300</color>

    <color name="popup_color_primary_dark">@android:color/system_primary_800</color>

    <color name="popup_color_secondary_dark">@android:color/system_primary_900</color>

    <color name="popup_color_tertiary_dark">@android:color/system_primary_700</color>

    <color name="popup_color_primary_light">@android:color/system_neutral1_50</color>

    <color name="popup_color_secondary_light">@android:color/system_neutral2_100</color>

    <color name="popup_color_tertiary_light">@android:color/system_neutral2_300</color>

    <color name="popup_color_primary_dark">@android:color/system_neutral1_800</color>

    <color name="popup_color_secondary_dark">@android:color/system_neutral1_900</color>

    <color name="popup_color_tertiary_dark">@android:color/system_neutral2_700</color>



    <color name="workspace_text_color_light">@android:color/system_primary_50</color>

    <color name="workspace_text_color_dark">@android:color/system_primary_900</color>

    <color name="workspace_text_color_light">@android:color/system_neutral1_50</color>

    <color name="workspace_text_color_dark">@android:color/system_neutral1_900</color>



    <color name="text_color_primary_dark">@android:color/system_primary_50</color>

    <color name="text_color_secondary_dark">@android:color/system_primary_200</color>

    <color name="text_color_tertiary_dark">@android:color/system_primary_400</color>

    <color name="text_color_primary_dark">@android:color/system_neutral1_50</color>

    <color name="text_color_secondary_dark">@android:color/system_neutral2_200</color>

    <color name="text_color_tertiary_dark">@android:color/system_neutral2_400</color>

</resources>
 
 No newline at end of file

tests/res/layout/test_layout_appwidget_dynamic_colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
        <ImageView

            android:layout_width="24dp"

            android:layout_height="24dp"

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

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

    </LinearLayout>

    <LinearLayout

        android:orientation = "horizontal"
@@ -32,7 +32,7 @@ 
        <ImageView

            android:layout_width="24dp"

            android:layout_height="24dp"

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

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

    </LinearLayout>

    <LinearLayout

        android:orientation = "horizontal"
@@ -46,7 +46,7 @@ 
        <ImageView

            android:layout_width="24dp"

            android:layout_height="24dp"

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

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

    </LinearLayout>



    </LinearLayout>
 
 No newline at end of file