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

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

Merge "[Settingslib] Remove m3 expressive button styles" into main

parents 899202ec 0280cf26

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

+4 −4
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


<resources>

    <style name="SettingsLibButtonStyle.Expressive.Filled"

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

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

        <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>
@@ -52,7 +52,7 @@ 
    </style>



    <style name="SettingsLibButtonStyle.Expressive.Tonal"

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

        parent="@style/Widget.Material3Expressive.Button.TonalButton">

        <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>
@@ -87,7 +87,7 @@ 
    </style>



    <style name="SettingsLibButtonStyle.Expressive.Outline"

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

        parent="@style/Widget.Material3Expressive.Button.OutlinedButton">

        <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>

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

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ 
    </style>



    <style name="SettingslibTextButtonStyle.Expressive"

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

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

        <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>

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

deleted100644 → 0
+0 −475

File deleted.

Preview size limit exceeded, changes collapsed.