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

Commit 07ea47b2 authored by Stefan Maftei's avatar Stefan Maftei
Browse files

Adjust Alert Dialog Buttons for CollapsingToolbarAppCompatActivity 

Bug: 431115782
Test: visual
Flag: EXEMPT adjusting colors
Change-Id: I30da390846d9b06878feedd8661b08dd5861beb7
parent 3233ae9e

packages/SettingsLib/SettingsTheme/res/drawable/settingslib_expressive_button_background_outline.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <solid android:color="@android:color/transparent" />

    <stroke android:width="1dp"

        android:color="@color/settingslib_materialColorOutlineVariant"/>

    <corners android:radius="@dimen/settingslib_expressive_radius_full"/>

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

+4 −0
Original line number Diff line number Diff line
@@ -49,4 +49,8 @@ 
           parent="android:style/Widget.Material.ProgressBar.Horizontal">

        <item name="android:progressDrawable">@drawable/settingslib_progress_horizontal</item>

    </style>



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

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

    </style>

</resources>

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

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ 
        <item name="android:colorError">@color/settingslib_dialog_colorError</item>

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



        <item name="buttonBarPositiveButtonStyle">@style/AlertDialog.Button.SettingsLib</item>

        <item name="buttonBarNegativeButtonStyle">@style/AlertDialog.Button.SettingsLib</item>

        <item name="buttonBarNeutralButtonStyle">@style/AlertDialog.Button.SettingsLib</item>



        <item name="android:windowSoftInputMode">adjustResize</item>

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

        <item name="android:clipChildren">true</item>

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

+2 −0
Original line number Diff line number Diff line
@@ -451,12 +451,14 @@ 
    <style name="Widget.SettingsLib.DialogButton.Filled">

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

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

        <item name="backgroundTint">@color/settingslib_materialColorPrimary</item>

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

    </style>



    <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="backgroundTint">@color/settingslib_materialColorOutlineVariant</item>

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

    </style>

</resources>