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

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

Merge "Implement RequestAppFunctionDialog" into main

parents 298837c0 560bdd1f

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

+18 −0
Original line number Diff line number Diff line
@@ -434,6 +434,13 @@ 
        <item name="android:clipToPadding">false</item>

    </style>



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

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

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

        <item name="android:layout_gravity">center</item>

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

    </style>



    <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>
@@ -459,4 +466,15 @@ 
        <item name="android:background">@drawable/settingslib_expressive_button_background_outline</item>

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

    </style>



    <style name="Widget.SettingsLib.DialogButton.Filled.Vertical">

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

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

        <item name="android:minWidth">310dp</item>

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

    </style>



    <style name="Widget.SettingsLib.DialogButton.Filled.Vertical.Negative">

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

    </style>

</resources>

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

+6 −0
Original line number Diff line number Diff line
@@ -86,5 +86,11 @@ 
        <item name="android:buttonBarNeutralButtonStyle">@style/Widget.SettingsLib.DialogButton</item>

    </style>



    <style name="Theme.DeviceDefault.AlertDialog.SettingsLib.Expressive.Vertical">

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

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

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

    </style>



    <style name="Theme.DeviceDefault.Dialog.Alert.DayNight" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />

</resources>