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

Commit 7bef9eb4 authored by Edgar Wang's avatar Edgar Wang
Browse files

Update color of Spinners based on new UX 

- only apply in Android V and after
- introduce materialColor in SettingsLib

Bug: 315098674
Test: visual
Change-Id: Ica5c76c4bd5d6ab708d8e1c887c2ed253ed6c8a7
parent 65ef41fb

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

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

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



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

        android:viewportWidth="18"

        android:viewportHeight="18"

        android:width="24dp"

        android:height="24dp">

    <path

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

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

</vector>

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

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

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<ripple

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

    android:color="@color/settingslib_ripple_color">



    <item android:id="@android:id/background">

        <layer-list

            android:paddingMode="stack"

            android:paddingStart="0dp"

            android:paddingEnd="24dp">

            <item

                android:top="8dp"

                android:bottom="8dp">



                <shape>

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

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

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

                </shape>

            </item>



            <item

                android:gravity="center|end"

                android:width="18dp"

                android:height="18dp"

                android:end="12dp"

                android:drawable="@drawable/settingslib_arrow_drop_down"/>

        </layer-list>

    </item>

</ripple>

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

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

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<ripple

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

    android:color="@color/settingslib_ripple_color">



    <item android:id="@android:id/background">

        <layer-list

            android:paddingMode="stack"

            android:paddingStart="0dp"

            android:paddingEnd="12dp">



            <item>

                <shape>

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

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

                </shape>

            </item>

        </layer-list>

    </item>

</ripple>

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

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

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->



<resources>

    <color name="settingslib_materialColorSurfaceContainerLowest">@android:color/system_surface_container_lowest_dark</color>

    <color name="settingslib_materialColorOnSecondaryContainer">@android:color/system_on_secondary_container_dark</color>

    <color name="settingslib_materialColorOnTertiaryContainer">@android:color/system_on_tertiary_container_dark</color>

    <color name="settingslib_materialColorSurfaceContainerLow">@android:color/system_surface_container_low_dark</color>

    <color name="settingslib_materialColorOnPrimaryContainer">@android:color/system_on_primary_container_dark</color>

    <color name="settingslib_materialColorOnErrorContainer">@android:color/system_on_error_container_dark</color>

    <color name="settingslib_materialColorOnSurfaceInverse">@android:color/system_on_surface_light</color>

    <color name="settingslib_materialColorSecondaryContainer">@android:color/system_secondary_container_dark</color>

    <color name="settingslib_materialColorErrorContainer">@android:color/system_error_container_dark</color>

    <color name="settingslib_materialColorPrimaryInverse">@android:color/system_primary_light</color>

    <color name="settingslib_materialColorSurfaceInverse">@android:color/system_surface_light</color>

    <color name="settingslib_materialColorSurfaceVariant">@android:color/system_surface_variant_dark</color>

    <color name="settingslib_materialColorTertiaryContainer">@android:color/system_tertiary_container_dark</color>

    <color name="settingslib_materialColorPrimaryContainer">@android:color/system_primary_container_dark</color>

    <color name="settingslib_materialColorOnBackground">@android:color/system_on_background_dark</color>

    <color name="settingslib_materialColorOnSecondary">@android:color/system_on_secondary_dark</color>

    <color name="settingslib_materialColorOnTertiary">@android:color/system_on_tertiary_dark</color>

    <color name="settingslib_materialColorSurfaceDim">@android:color/system_surface_dim_dark</color>

    <color name="settingslib_materialColorSurfaceBright">@android:color/system_surface_bright_dark</color>

    <color name="settingslib_materialColorOnError">@android:color/system_on_error_dark</color>

    <color name="settingslib_materialColorSurface">@android:color/system_surface_dark</color>

    <color name="settingslib_materialColorSurfaceContainerHigh">@android:color/system_surface_container_high_dark</color>

    <color name="settingslib_materialColorSurfaceContainerHighest">@android:color/system_surface_container_highest_dark</color>

    <color name="settingslib_materialColorOnSurfaceVariant">@android:color/system_on_surface_variant_dark</color>

    <color name="settingslib_materialColorOutline">@android:color/system_outline_dark</color>

    <color name="settingslib_materialColorOutlineVariant">@android:color/system_outline_variant_dark</color>

    <color name="settingslib_materialColorOnPrimary">@android:color/system_on_primary_dark</color>

    <color name="settingslib_materialColorOnSurface">@android:color/system_on_surface_dark</color>

    <color name="settingslib_materialColorSurfaceContainer">@android:color/system_surface_container_dark</color>

    <color name="settingslib_materialColorPrimary">@android:color/system_primary_dark</color>

    <color name="settingslib_materialColorSecondary">@android:color/system_secondary_dark</color>

    <color name="settingslib_materialColorTertiary">@android:color/system_tertiary_dark</color>

</resources>

packages/SettingsLib/SettingsTheme/res/values-v35/colors.xml

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

<!--

  Copyright (C) 2024 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

-->



<resources>

    <!-- The text color of spinner title -->

    <color name="settingslib_spinner_title_color">@color/settingslib_materialColorOnPrimaryContainer</color>

    <!-- The text color of dropdown item title -->

    <color name="settingslib_spinner_dropdown_color">@color/settingslib_materialColorOnPrimaryContainer</color>





    <color name="settingslib_materialColorOnSecondaryFixedVariant">@android:color/system_on_secondary_fixed_variant</color>

    <color name="settingslib_materialColorOnTertiaryFixedVariant">@android:color/system_on_tertiary_fixed_variant</color>

    <color name="settingslib_materialColorSurfaceContainerLowest">@android:color/system_surface_container_lowest_light</color>

    <color name="settingslib_materialColorOnPrimaryFixedVariant">@android:color/system_on_primary_fixed_variant</color>

    <color name="settingslib_materialColorOnSecondaryContainer">@android:color/system_on_secondary_container_light</color>

    <color name="settingslib_materialColorOnTertiaryContainer">@android:color/system_on_tertiary_container_light</color>

    <color name="settingslib_materialColorSurfaceContainerLow">@android:color/system_surface_container_low_light</color>

    <color name="settingslib_materialColorOnPrimaryContainer">@android:color/system_on_primary_container_light</color>

    <color name="settingslib_materialColorSecondaryFixedDim">@android:color/system_secondary_fixed_dim</color>

    <color name="settingslib_materialColorOnErrorContainer">@android:color/system_on_error_container_light</color>

    <color name="settingslib_materialColorOnSecondaryFixed">@android:color/system_on_secondary_fixed</color>

    <color name="settingslib_materialColorOnSurfaceInverse">@android:color/system_on_surface_dark</color>

    <color name="settingslib_materialColorTertiaryFixedDim">@android:color/system_tertiary_fixed_dim</color>

    <color name="settingslib_materialColorOnTertiaryFixed">@android:color/system_on_tertiary_fixed</color>

    <color name="settingslib_materialColorPrimaryFixedDim">@android:color/system_primary_fixed_dim</color>

    <color name="settingslib_materialColorSecondaryContainer">@android:color/system_secondary_container_light</color>

    <color name="settingslib_materialColorErrorContainer">@android:color/system_error_container_light</color>

    <color name="settingslib_materialColorOnPrimaryFixed">@android:color/system_on_primary_fixed</color>

    <color name="settingslib_materialColorPrimaryInverse">@android:color/system_primary_dark</color>

    <color name="settingslib_materialColorSecondaryFixed">@android:color/system_secondary_fixed</color>

    <color name="settingslib_materialColorSurfaceInverse">@android:color/system_surface_dark</color>

    <color name="settingslib_materialColorSurfaceVariant">@android:color/system_surface_variant_light</color>

    <color name="settingslib_materialColorTertiaryContainer">@android:color/system_tertiary_container_light</color>

    <color name="settingslib_materialColorTertiaryFixed">@android:color/system_tertiary_fixed</color>

    <color name="settingslib_materialColorPrimaryContainer">@android:color/system_primary_container_light</color>

    <color name="settingslib_materialColorOnBackground">@android:color/system_on_background_light</color>

    <color name="settingslib_materialColorPrimaryFixed">@android:color/system_primary_fixed</color>

    <color name="settingslib_materialColorOnSecondary">@android:color/system_on_secondary_light</color>

    <color name="settingslib_materialColorOnTertiary">@android:color/system_on_tertiary_light</color>

    <color name="settingslib_materialColorSurfaceDim">@android:color/system_surface_dim_light</color>

    <color name="settingslib_materialColorSurfaceBright">@android:color/system_surface_bright_light</color>

    <color name="settingslib_materialColorOnError">@android:color/system_on_error_light</color>

    <color name="settingslib_materialColorSurface">@android:color/system_surface_light</color>

    <color name="settingslib_materialColorSurfaceContainerHigh">@android:color/system_surface_container_high_light</color>

    <color name="settingslib_materialColorSurfaceContainerHighest">@android:color/system_surface_container_highest_light</color>

    <color name="settingslib_materialColorOnSurfaceVariant">@android:color/system_on_surface_variant_light</color>

    <color name="settingslib_materialColorOutline">@android:color/system_outline_light</color>

    <color name="settingslib_materialColorOutlineVariant">@android:color/system_outline_variant_light</color>

    <color name="settingslib_materialColorOnPrimary">@android:color/system_on_primary_light</color>

    <color name="settingslib_materialColorOnSurface">@android:color/system_on_surface_light</color>

    <color name="settingslib_materialColorSurfaceContainer">@android:color/system_surface_container_light</color>

    <color name="settingslib_materialColorPrimary">@android:color/system_primary_light</color>

    <color name="settingslib_materialColorSecondary">@android:color/system_secondary_light</color>

    <color name="settingslib_materialColorTertiary">@android:color/system_tertiary_light</color>

</resources>
 
 No newline at end of file