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

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

Merge "[PM] Support material AlertDialog (6/N)" into main

parents 3dbadc54 833b8614

packages/PackageInstaller/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -51,4 +51,6 @@ 
    <dimen name="alert_dialog_inner_padding">24dp</dimen>

    <dimen name="button_min_height">40dp</dimen>

    <dimen name="dialog_inter_element_vertical_margin">12dp</dimen>

    <dimen name="alert_dialog_radius">28dp</dimen>

    <dimen name="alert_dialog_dim_amount">0.68</dimen>

</resources>

packages/PackageInstaller/res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -156,4 +156,8 @@ 
    <style name="TextAppearance.PackageInstaller.Material.KeepData.SubHeading" parent="@style/TextAppearance.PackageInstaller.BodyMedium">

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

    </style>



    <style name="ShapeAppearance">

        <item name="cornerSize">@dimen/alert_dialog_radius</item>

    </style>

</resources>

packages/PackageInstaller/res/values/themes.xml

+5 −2
Original line number Diff line number Diff line
@@ -28,9 +28,10 @@ 
        <item name="textAppearanceInstallerKeepDataSubHeading">@style/TextAppearance.PackageInstaller.KeepData.SubHeading</item>

    </style>



    <style name="Theme.AlertDialogActivity.Material" parent="Theme.Material3.DynamicColors.DayNight">

    <style name="Theme.AlertDialogActivity.Material" parent="@style/Theme.Material3.DayNight.Dialog.Alert">

        <!-- TODO (b/274120822): Remove this attribute when we replace all dialogs to MaterialAlertDialog -->

        <item name="android:alertDialogTheme">@style/Theme.MaterialAlertDialog.System</item>

        <item name="android:backgroundDimAmount">@dimen/alert_dialog_dim_amount</item>

        <item name="materialAlertDialogTheme">@style/Theme.MaterialAlertDialog</item>

        <item name="textAppearanceInstallerAppLabel">@style/TextAppearance.PackageInstaller.Material.AppLabel</item>

        <item name="textAppearanceInstallerCustomMessage">@style/TextAppearance.PackageInstaller.Material.CustomMessage</item>
@@ -47,13 +48,15 @@ 
    </style>



    <style name="Theme.MaterialAlertDialog" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">

        <item name="android:backgroundDimAmount">@dimen/alert_dialog_dim_amount</item>

        <item name="buttonBarStyle">@style/Widget.PackageInstaller.Material.ButtonBar</item>

        <item name="buttonBarPositiveButtonStyle">@style/Widget.PackageInstaller.Material.Button.Colored</item>

        <item name="buttonBarNegativeButtonStyle">@style/Widget.PackageInstaller.Material.Button.Outlined</item>

        <item name="materialAlertDialogTitleTextStyle">@style/Widget.PackageInstaller.Material.WindowTitle</item>

        <item name="shapeAppearanceOverlay">@style/ShapeAppearance</item>

    </style>



    <style name="Theme.MaterialAlertDialog.Variant" parent="@style/Theme.MaterialAlertDialog.System">

    <style name="Theme.MaterialAlertDialog.Variant" parent="">

        <item name="buttonBarPositiveButtonStyle">@style/Widget.PackageInstaller.Material.Button</item>

        <item name="buttonBarNegativeButtonStyle">@style/Widget.PackageInstaller.Material.Button</item>

    </style>