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

Commit 1981144f authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '1055-t-a13' into 'v1-t' 

Fix some components so that they match our palette

See merge request e/os/android_frameworks_base!158
parents 53fcd667 73e6c7e1

core/res/res/values/colors_device_defaults.xml

+2 −2
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ 
    <color name="accent_tertiary_device_default">@color/system_accent3_100</color>



    <!-- Accent variants -->

    <color name="accent_primary_variant_light_device_default">@color/system_accent1_600</color>

    <color name="accent_primary_variant_light_device_default">@color/accent_device_default_light</color>

    <color name="accent_secondary_variant_light_device_default">@color/system_accent2_600</color>

    <color name="accent_tertiary_variant_light_device_default">@color/system_accent3_600</color>

    <color name="accent_primary_variant_dark_device_default">@color/system_accent1_300</color>

    <color name="accent_primary_variant_dark_device_default">@color/accent_device_default_dark</color>

    <color name="accent_secondary_variant_dark_device_default">@color/system_accent2_300</color>

    <color name="accent_tertiary_variant_dark_device_default">@color/system_accent3_300</color>

packages/SettingsLib/SettingsTheme/res/drawable-v33/settingslib_arrow_drop_down.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@ 
        android:height="24dp">

    <path

        android:pathData="M7 10l5 5 5 -5z"

        android:fillColor="@android:color/black"/>

        android:fillColor="@color/settingslib_spinner_dropdown_color"/>

</vector>

packages/SettingsLib/SettingsTheme/res/drawable-v33/settingslib_spinner_background.xml

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


                <shape>

                    <corners android:radius="28dp"/>

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

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

                    <size android:height="@dimen/settingslib_spinner_height"/>

                </shape>

            </item>

packages/SettingsLib/SettingsTheme/res/drawable-v33/settingslib_spinner_dropdown_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
            <item>

                <shape>

                    <corners android:radius="10dp"/>

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

                    <solid android:color="?android:attr/colorBackgroundFloating"/>

                </shape>

            </item>

        </layer-list>

packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -51,4 +51,6 @@ 
    <color name="settingslib_surface_dark">@android:color/system_neutral1_800</color>



    <color name="settingslib_colorSurface">@color/settingslib_surface_dark</color>



    <color name="settingslib_spinner_dropdown_color">@*android:color/bright_foreground_holo_dark</color>

</resources>
 
 No newline at end of file