Contacts dark: follow system backgroundr11.0

Change-Id: Ica4700fadbd86cb48407ab92e416d1281d25762c

5 files changed, 44 insertions, 40 deletions

diff --git a/dark-res/values-night-v27/styles.xml b/dark-res/values-night-v27/styles.xml
index 9dacaddfb..6a21d8f18 100644
--- a/dark-res/values-night-v27/styles.xml
+++ b/dark-res/values-night-v27/styles.xml
@@ -65,7 +65,7 @@
         <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
         <item name="list_item_profile_photo_size">70dip</item>
         <item name="list_item_prefix_highlight_color">#363636</item>
-        <item name="list_item_background_color">#ff303030</item>
+        <item name="list_item_background_color">@*android:color/background_device_default_dark</item>
         <item name="list_item_header_text_color">#363636</item>
         <item name="list_item_header_text_size">14sp</item>
         <item name="list_item_header_height">30dip</item>
@@ -74,13 +74,13 @@
         <item name="list_item_header_text_indent">8dip</item>
         <item name="contact_browser_list_padding_left">0dip</item>
         <item name="contact_browser_list_padding_right">0dip</item>
-        <item name="contact_browser_background">@*android:color/background_material_dark</item>
+        <item name="contact_browser_background">@*android:color/background_device_default_dark</item>
         <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
         <!-- Favorites -->
         <item name="favorites_padding_bottom">0dip</item>
     </style>
 
-    <style name="PeopleThemeAppCompat" parent="@style/Theme.AppCompat">
+    <style name="PeopleThemeAppCompat" parent="@style/DeviceDefault.Theme.AppCompat">
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
         <!--
         <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
@@ -155,7 +155,7 @@
         -->
     </style>
 
-    <style name="LaunchScreenTheme" parent="@style/Theme.AppCompat">
+    <style name="LaunchScreenTheme" parent="@style/DeviceDefault.Theme.AppCompat">
         <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>
         <!-- Ensure the status bar color matches the background -->
         <item name="android:colorPrimaryDark">@android:color/black</item>
diff --git a/dark-res/values-night/colors.xml b/dark-res/values-night/colors.xml
index 01c2eb244..6516ce813 100644
--- a/dark-res/values-night/colors.xml
+++ b/dark-res/values-night/colors.xml
@@ -21,7 +21,7 @@ packages/apps/ContactsCommon
 
 <resources>
 
-    <color name="quickcontact_name_detail_background">@*android:color/background_material_dark</color>
+    <color name="quickcontact_name_detail_background">@*android:color/background_device_default_dark</color>
     <color name="quickcontact_entry_sub_header_text_color">#b3ffffff</color>
     <color name="quickcontact_entry_header_text_color">#ffffffff</color>
 
@@ -53,7 +53,7 @@ packages/apps/ContactsCommon
     <color name="expanding_entry_card_button_text_color">#ffffffff</color>
 
     <!-- Background color for an ExpandingEntryCard -->
-    <color name="expanding_entry_card_background_color">@*android:color/background_material_dark</color>
+    <color name="expanding_entry_card_background_color">@*android:color/background_device_default_dark</color>
 
     <!-- Color of the margin for cards -->
     <color name="card_margin_color">#ff000000</color>
@@ -61,12 +61,12 @@ packages/apps/ContactsCommon
     <color name="call_arrow_green">#00e676</color>
     <color name="call_arrow_red">#f44336</color>
 
-    <color name="contact_all_list_background_color">@*android:color/background_material_dark</color>
-    <color name="contact_favorites_list_background_color">@*android:color/background_material_dark</color>
-    <color name="group_list_background_color">@*android:color/background_material_dark</color>
+    <color name="contact_all_list_background_color">@*android:color/background_device_default_dark</color>
+    <color name="contact_favorites_list_background_color">@*android:color/background_device_default_dark</color>
+    <color name="group_list_background_color">@*android:color/background_device_default_dark</color>
 
     <!-- Background color of pinned header items. -->
-    <color name="list_item_pinned_header_color">@*android:color/background_material_dark</color>
+    <color name="list_item_pinned_header_color">@*android:color/background_device_default_dark</color>
 
     <!-- Color of the mime-type icons inside the editor. -->
     <color name="editor_icon_color">#b3ffffff</color>
@@ -75,21 +75,21 @@ packages/apps/ContactsCommon
     <color name="editor_disabled_text_color">#80ffffff</color>
 
     <color name="list_item_name_text_color">#ffffffff</color>
-    <color name="editor_account_header_bg">@*android:color/background_material_dark</color>
+    <color name="editor_account_header_bg">@*android:color/background_device_default_dark</color>
 
 
 
     <!-- Contacts common stuff: -->
 
     <!-- Color of the background of the contact detail and editor pages -->
-    <color name="background_primary">@*android:color/background_material_dark</color>
+    <color name="background_primary">@*android:color/background_device_default_dark</color>
     <!-- Divider color for header separator -->
     <color name="primary_text_color">#ffffffff</color>
     <color name="secondary_text_color">#b3ffffff</color>
     <!-- Color of the theme of the People app -->
     <color name="people_app_theme_color">#363636</color>
 
-    <color name="cardview_light_background">@*android:color/background_material_dark</color>
+    <color name="cardview_light_background">@*android:color/background_device_default_dark</color>
 
     <color name="dialtacts_primary_text_color">#ffffffff</color>
     <color name="dialtacts_secondary_text_color">#b3ffffff</color>
@@ -155,10 +155,10 @@ packages/apps/ContactsCommon
 
     <color name="dialtacts_theme_color">#0288d1</color>
     <color name="contacts_text_color">#ffffffff</color>
-    <color name="empty_state_background">@*android:color/background_material_dark</color>
+    <color name="empty_state_background">@*android:color/background_device_default_dark</color>
 
     <color name="drawer_divider_color">#80ffffff</color>
-    <color name="navigation_drawer_background_color">@*android:color/background_material_dark</color>
+    <color name="navigation_drawer_background_color">@*android:color/background_device_default_dark</color>
     <color name="drawer_selected_color">#ff424242</color>
     <color name="control_highlight_color">#1affffff</color>
 
diff --git a/dark-res/values-night/styles.xml b/dark-res/values-night/styles.xml
index 821104663..758087e90 100644
--- a/dark-res/values-night/styles.xml
+++ b/dark-res/values-night/styles.xml
@@ -66,7 +66,7 @@
         <item name="list_item_photo_size">@dimen/contact_browser_list_item_photo_size</item>
         <item name="list_item_profile_photo_size">70dip</item>
         <item name="list_item_prefix_highlight_color">#363636</item>
-        <item name="list_item_background_color">#ff303030</item>
+        <item name="list_item_background_color">@*android:color/background_device_default_dark</item>
         <item name="list_item_header_text_color">#363636</item>
         <item name="list_item_header_text_size">14sp</item>
         <item name="list_item_header_height">30dip</item>
@@ -75,13 +75,13 @@
         <item name="list_item_header_text_indent">8dip</item>
         <item name="contact_browser_list_padding_left">0dip</item>
         <item name="contact_browser_list_padding_right">0dip</item>
-        <item name="contact_browser_background">@*android:color/background_material_dark</item>
+        <item name="contact_browser_background">@*android:color/background_device_default_dark</item>
         <item name="list_item_text_indent">@dimen/contact_browser_list_item_text_indent</item>
         <!-- Favorites -->
         <item name="favorites_padding_bottom">0dip</item>
     </style>
 
-    <style name="PeopleThemeAppCompat" parent="@style/Theme.AppCompat">
+    <style name="PeopleThemeAppCompat" parent="@style/DeviceDefault.Theme.AppCompat">
         <!-- Styles that require AppCompat compatibility, remember to update both sets -->
         <!--
         <item name="android:actionBarStyle">@style/ContactsActionBarStyleAppCompat</item>
@@ -270,7 +270,7 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="LaunchScreenTheme" parent="@style/Theme.AppCompat">
+    <style name="LaunchScreenTheme" parent="@style/DeviceDefault.Theme.AppCompat">
         <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>
         <!-- Ensure the status bar color matches the background -->
         <item name="android:colorPrimaryDark">@android:color/black</item>
diff --git a/dark-res/values/appcompat_styles.xml b/dark-res/values/appcompat_styles.xml
new file mode 100644
index 000000000..6f7d9bb57
--- /dev/null
+++ b/dark-res/values/appcompat_styles.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2020 Android Ice Cold Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<resources>
+
+    <style name="DeviceDefault.Theme.AppCompat" parent="Theme.AppCompat">
+        <item name="android:colorBackground">@*android:color/background_device_default_dark</item>
+        <item name="android:colorBackgroundFloating">@*android:color/background_floating_device_default_dark</item>
+        <item name="colorBackgroundFloating">@*android:color/background_floating_device_default_dark</item>
+    </style>
+
+</resources>
diff --git a/dark-res/values/overlay_label_strings.xml b/dark-res/values/overlay_label_strings.xml
deleted file mode 100644
index a22de4c7e..000000000
--- a/dark-res/values/overlay_label_strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-/**
- * Copyright (C) 2019-2020 Android Ice Cold Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<resources>
-    <string name="theming_better_dark_contacts">Dark contacts</string>
-</resources>