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

Commit 39b31ddf authored by Yi-an Chen's avatar Yi-an Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix padding/styles used in Theme.DeviceDefault.AlertDialog.SettingsLib.Expressive" into main

parents 61d24a5a 6790f716

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

+5 −3
Original line number Diff line number Diff line
@@ -126,11 +126,12 @@ 
    </style>



    <style name="Widget.SettingsLib.ButtonBar" parent="@style/Widget.AppCompat.ButtonBar.AlertDialog">

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

        <item name="android:paddingTop">28dp</item>

        <item name="android:paddingBottom">@dimen/settingslib_expressive_space_extrasmall6</item>

        <item name="android:minHeight">@dimen/settingslib_expressive_space_large2</item>

    </style>



    <style name="Widget.SettingsLib.DialogButton" parent="@style/Widget.AppCompat.Button">

    <style name="Widget.SettingsLib.DialogButton" parent="@android:style/Widget.DeviceDefault.Button">

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

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

        <item name="android:minHeight">0dp</item>
@@ -138,7 +139,7 @@ 
        <item name="android:paddingVertical">@dimen/settingslib_expressive_space_extrasmall5</item>

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

        <item name="android:stateListAnimator">@null</item>

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

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

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

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

        <item name="android:background">@android:color/transparent</item>
@@ -153,5 +154,6 @@ 
    <style name="Widget.SettingsLib.DialogButton.Outline">

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

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

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

    </style>

</resources>

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

+3 −1
Original line number Diff line number Diff line
@@ -76,8 +76,10 @@ 
    </style>



    <style name="Theme.DeviceDefault.AlertDialog.SettingsLib.Expressive" parent="@style/Theme.DeviceDefault.Dialog.Alert.DayNight">

        <item name="android:colorAccent">@color/settingslib_materialColorPrimary</item>

        <item name="android:colorBackground">@color/settingslib_materialColorSurfaceContainerHigh</item>

        <item name="android:dialogPreferredPadding">@dimen/settingslib_expressive_space_small4</item>

        <item name="android:windowTitleStyle">@style/Widget.SettingsLib.DialogWindowTitle</item>

        <item name="dialogPreferredPadding">@dimen/settingslib_expressive_space_small4</item>

        <item name="android:buttonBarStyle">@style/Widget.SettingsLib.ButtonBar</item>

        <item name="android:buttonBarPositiveButtonStyle">@style/Widget.SettingsLib.DialogButton.Filled</item>

        <item name="android:buttonBarNegativeButtonStyle">@style/Widget.SettingsLib.DialogButton.Outline</item>