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

Commit 40687c8c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update style of CollapsableTextView" into main

parents 354e3282 31e11f33

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

+0 −12
Original line number Diff line number Diff line
@@ -104,18 +104,6 @@ 
        <item name="android:layout_width">match_parent</item>

    </style>



    <style name="SettingslibTextAppearance.LinkableTextStyle.Expressive"

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

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="SettingslibTextButtonStyle.Expressive"

        parent="@style/Widget.Material3Expressive.Button.TextButton.Icon">

        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>

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

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

    </style>



    <style name="SettingsLibCardStyle" parent="">

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

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

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

+12 −0
Original line number Diff line number Diff line
@@ -250,4 +250,16 @@ 
        <item name="android:lineHeight" tools:targetApi="28">16sp</item>

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

    </style>



    <style name="SettingslibTextAppearance.LinkableTextStyle.Expressive"

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

        <item name="android:textColor">?android:attr/colorAccent</item>

    </style>



    <style name="SettingslibTextButtonStyle.Expressive"

           parent="@style/Widget.Material3Expressive.Button.TextButton.Icon">

        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>

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

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

    </style>

</resources>
 
 No newline at end of file