summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-12-17 17:07:21 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-12-17 17:07:21 +0000
commit49a275c53e73251f6e9025154a8df8932ca65022 (patch)
tree7cec612d70e9aa3895f860128c2f89c7aa2ba1d7
parenta73e18bf5fe23d82af6af62172ddee1343e9dec7 (diff)
parentf53c38845930b7aed9e722896f3f359e408a58a1 (diff)
Merge "Specify colorBackgroundFloating for DeviceDefault."
-rw-r--r--core/res/res/values/themes_device_defaults.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index 5afca79c0d92..0ed821200ed4 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -211,7 +211,7 @@ easier.
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
<item name="colorAccent">@color/accent_device_default_dark</item>
<item name="colorError">@color/error_color_device_default_dark</item>
-
+ <item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
</style>
<style name="Theme.DeviceDefault" parent="Theme.DeviceDefaultBase" />
@@ -936,6 +936,7 @@ easier.
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
<item name="colorAccent">@color/accent_device_default_light</item>
<item name="colorError">@color/error_color_device_default_light</item>
+ <item name="colorBackgroundFloating">@color/background_floating_device_default_light</item>
</style>
<!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an