Merge "Revert "Update dialog background color for dark theme"" into qt-dev
am: 69faee7358
Change-Id: Ib6439a8a85383b6171a98474be18e30d56ea2b88
This commit is contained in:
@@ -22,8 +22,6 @@
|
|||||||
<color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>
|
<color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>
|
||||||
<color name="contextual_card_background">@*android:color/material_grey_900</color>
|
<color name="contextual_card_background">@*android:color/material_grey_900</color>
|
||||||
<color name="search_bar_background">@*android:color/material_grey_800</color>
|
<color name="search_bar_background">@*android:color/material_grey_800</color>
|
||||||
<!-- Dialog background color -->
|
|
||||||
<color name="dialog_background">@*android:color/material_grey_800</color>
|
|
||||||
<color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>
|
<color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>
|
||||||
<color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->
|
<color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->
|
||||||
<color name="notification_importance_button_unselected">#5F6368</color>
|
<color name="notification_importance_button_unselected">#5F6368</color>
|
||||||
|
@@ -33,7 +33,6 @@
|
|||||||
|
|
||||||
<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:background">@color/dialog_background</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
@@ -144,7 +144,4 @@
|
|||||||
<!-- Search bar background color -->
|
<!-- Search bar background color -->
|
||||||
<color name="search_bar_background">@android:color/white</color>
|
<color name="search_bar_background">@android:color/white</color>
|
||||||
|
|
||||||
<!-- Dialog background color -->
|
|
||||||
<color name="dialog_background">@*android:color/background_device_default_light</color>
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
@@ -121,7 +121,6 @@
|
|||||||
|
|
||||||
<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:background">@color/dialog_background</item>
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">
|
<style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">
|
||||||
|
Reference in New Issue
Block a user