Merge "Fix dialog color problem in night mode." into sc-dev am: f026108de5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15008367

Change-Id: I7d06f1009b0f94bf2b8143416790e675493b1a0c
This commit is contained in:
TreeHugger Robot
2021-06-17 11:16:40 +00:00
committed by Automerger Merge Worker
3 changed files with 540 additions and 603 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -28,7 +28,8 @@
<style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert"> <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
<item name="colorAccent">@*android:color/accent_device_default_dark</item> <item name="colorAccent">@*android:color/accent_device_default_dark</item>
<item name="android:colorBackground">?androidprv:attr/colorSurface</item> <item name="android:colorError">@color/settings_dialog_colorError</item>
<item name="android:colorBackground">@*android:color/surface_dark</item>
</style> </style>
<!-- Material theme for the pages containing TabLayout and ViewPager --> <!-- Material theme for the pages containing TabLayout and ViewPager -->

View File

@@ -130,7 +130,7 @@
<style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert"> <style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
<item name="colorAccent">@*android:color/accent_device_default_light</item> <item name="colorAccent">@*android:color/accent_device_default_light</item>
<item name="android:colorError">@color/settings_dialog_colorError</item> <item name="android:colorError">@color/settings_dialog_colorError</item>
<item name="android:colorBackground">?androidprv:attr/colorSurface</item> <item name="android:colorBackground">@*android:color/surface_light</item>
</style> </style>
<style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base"> <style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">