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

Commit ef1502c2 authored by Edgar Wang's avatar Edgar Wang
Browse files

[Expressive design] update android.app.AlertDialog style 

Bug: 413361298
Bug: 411037948
Bug: 411832051
Test: visual
Flag: EXEMPT bug fix
Change-Id: I8327e9e3ef12c9794a122bcb47fab6b192ea18b5
parent fa5dff3d

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

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2025 The Android Open Source Project



    Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

  -->



<resources>

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

</resources>

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

+12 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
        <!-- For AndroidX AlertDialog -->

        <item name="alertDialogTheme">@style/Theme.AlertDialog.SettingsLib.Expressive</item>

        <!-- For AlertDialog -->

        <item name="android:alertDialogTheme">@style/Theme.AlertDialog.SettingsLib.Expressive</item>

        <item name="android:alertDialogTheme">@style/Theme.DeviceDefault.AlertDialog.SettingsLib.Expressive</item>

    </style>



    <style name="Theme.AlertDialog.SettingsLib.Expressive">
@@ -71,4 +71,15 @@ 
        <item name="buttonBarNegativeButtonStyle">@style/Widget.SettingsLib.DialogButton.Outline</item>

        <item name="buttonBarNeutralButtonStyle">@style/Widget.SettingsLib.DialogButton</item>

    </style>



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

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

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

    </style>



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

</resources>