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

Commit f43732d1 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[SettingsLib] Fix: move status banner card style to pre-U for compatible" into main

parents a09bd1c0 f231680f

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

+0 −10
Original line number Diff line number Diff line
@@ -417,16 +417,6 @@ 
        <item name="android:textAppearance">@style/TextAppearance.SettingsLib.TitleLarge.Emphasized</item>

    </style>



    <style name="SettingsLibStatusBannerCardStyle">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_marginVertical">@dimen/settingslib_expressive_space_extrasmall4</item>

        <item name="cardBackgroundColor">@color/settingslib_materialColorSurfaceBright</item>

        <item name="cardCornerRadius">@dimen/settingslib_expressive_radius_extralarge1</item>

        <item name="cardElevation">0dp</item>

        <item name="rippleColor">?android:attr/colorControlHighlight</item>

    </style>



    <style name="TextAppearance.SettingsLib.PreferenceTitle"

        parent="@style/TextAppearance.SettingsLib.TitleMedium">

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

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

+11 −0
Original line number Diff line number Diff line
@@ -300,4 +300,15 @@ 
        <item name="trackStopIndicatorPadding">@dimen/settingslib_expressive_radius_extrasmall2</item>

        <item name="indicatorTrackGapSize">@dimen/settingslib_expressive_radius_extrasmall1</item>

    </style>



    <style name="SettingsLibStatusBannerCardStyle">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_marginTop">@dimen/settingslib_expressive_space_extrasmall4</item>

        <item name="android:layout_marginBottom">@dimen/settingslib_expressive_space_extrasmall4</item>

        <item name="cardBackgroundColor">@color/settingslib_materialColorSurfaceBright</item>

        <item name="cardCornerRadius">@dimen/settingslib_expressive_radius_extralarge1</item>

        <item name="cardElevation">0dp</item>

        <item name="rippleColor">?android:attr/colorControlHighlight</item>

    </style>

</resources>