diff --git a/core/res/res/drawable/popup_background_material.xml b/core/res/res/drawable/popup_background_material.xml
index b1f0cf595771d..9ad7bfc68122b 100644
--- a/core/res/res/drawable/popup_background_material.xml
+++ b/core/res/res/drawable/popup_background_material.xml
@@ -20,6 +20,6 @@
+ android:color="?attr/colorPopupBackground" />
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 489a08ac93999..dffc2e979c174 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -87,6 +87,8 @@
theme does not set this value, meaning it is based on whether the
window is floating. -->
+
+
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index 2e984601524de..08d6d0621cf41 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -216,6 +216,7 @@ easier.
- @color/accent_device_default_dark
- @color/error_color_device_default_dark
- @color/background_floating_device_default_dark
+ - ?attr/colorBackgroundFloating
@@ -943,6 +944,7 @@ easier.
- @color/accent_device_default_light
- @color/error_color_device_default_light
- @color/background_floating_device_default_light
+ - ?attr/colorBackgroundFloating
- @style/TextAppearance.Material
@@ -422,6 +423,7 @@ please see themes_device_defaults.xml.
- @dimen/secondary_content_alpha_material_light
- 0.6
- @color/error_color_material_light
+ - ?attr/colorBackground
- @style/TextAppearance.Material