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

Commit f0fedb8f authored by David Liu's avatar David Liu Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] Update Spinner and Dropdown style" into main

parents 8871bca9 bdd7c139

packages/SettingsLib/SettingsTheme/res/values-v36/styles_expressive.xml

+18 −0
Original line number Diff line number Diff line
@@ -38,6 +38,24 @@ 
        <item name="android:dropDownVerticalOffset">@dimen/settingslib_expressive_space_large3</item>

    </style>



    <style name="SettingslibSpinnerItemStyle.Expressive"

        parent="@android:style/Widget.DeviceDefault.TextView.SpinnerItem">

        <item name="android:textAppearance">@style/TextAppearance.SettingsLib.LabelLarge</item>

        <item name="android:textColor">@color/settingslib_materialColorOnSecondaryContainer</item>

        <item name="android:paddingStart">@dimen/settingslib_expressive_space_small1</item>

        <item name="android:paddingEnd">@dimen/settingslib_expressive_space_small1</item>

    </style>



    <!-- dropdownPreference dropdown item -->

    <style name="SettingslibSpinnerDropDownItemStyle.Expressive"

        parent="@android:style/Widget.Material.DropDownItem.Spinner">

        <item name="android:textAppearance">@style/TextAppearance.SettingsLib.LabelLarge</item>

        <item name="android:textColor">@color/settingslib_materialColorOnSurface</item>

        <item name="android:layout_height">@dimen/settingslib_expressive_space_medium4</item>

        <item name="android:paddingStart">@dimen/settingslib_expressive_space_small1</item>

        <item name="android:paddingEnd">@dimen/settingslib_expressive_space_small1</item>

    </style>



    <style name="SettingslibSpinnerStyle.Expressive.Outlined">

        <item name="android:background">@drawable/settingslib_expressive_spinner_background_outlined</item>

    </style>

packages/SettingsLib/SettingsTheme/res/values-v36/themes_expressive.xml

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 


        <!-- Set up Spinner style -->

        <item name="android:spinnerStyle">@style/SettingslibSpinnerStyle.Expressive</item>

        <!--<item name="android:spinnerItemStyle"></item>

        <item name="android:spinnerDropDownItemStyle"></item>-->

        <item name="android:spinnerItemStyle">@style/SettingslibSpinnerItemStyle.Expressive</item>

        <item name="android:spinnerDropDownItemStyle">@style/SettingslibSpinnerDropDownItemStyle.Expressive</item>



        <!-- Set up edge-to-edge configuration for top app bar -->

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