From 9f5f0ee9b232f53a12d28a269b25b54af2406702 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timi=20Rautam=C3=A4ki?= <timi.rautamaki@gmail.com>
Date: Sun, 11 Jul 2021 19:56:07 +0200
Subject: Dialer: set statusbar color same as activity background

 * Keep styles that use actionBar as is because it uses
   normal actionbar
 * Set light statusbar attribute for some styles

Change-Id: I8748aa4d12f8e0c68d14d514ea5a2bd4100ee3ca
---
 .../dialer/main/impl/res/values-night/styles.xml   | 27 ++++++++++++++++++++++
 .../android/dialer/main/impl/res/values/styles.xml |  1 +
 .../theme/base/res/values/theme_dialer_light.xml   |  1 +
 .../theme/common/res/values-night/colors.xml       | 21 +++++++++++++++++
 .../hidden/res/values-night/colors_dialer_dark.xml |  2 +-
 .../hidden/res/values/colors_dialer_light.xml      |  3 ++-
 6 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 java/com/android/dialer/main/impl/res/values-night/styles.xml
 create mode 100644 java/com/android/dialer/theme/common/res/values-night/colors.xml

(limited to 'java')

diff --git a/java/com/android/dialer/main/impl/res/values-night/styles.xml b/java/com/android/dialer/main/impl/res/values-night/styles.xml
new file mode 100644
index 000000000..63d4e9c1e
--- /dev/null
+++ b/java/com/android/dialer/main/impl/res/values-night/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 The Android Open Source 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="LaunchTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <item name="android:colorPrimary">@color/dialer_theme_color</item>
+    <item name="colorPrimary">@color/dialer_theme_color</item>
+    <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
+    <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>
+    <item name="android:windowLightStatusBar">false</item>
+  </style>
+
+</resources>
diff --git a/java/com/android/dialer/main/impl/res/values/styles.xml b/java/com/android/dialer/main/impl/res/values/styles.xml
index 139b8b249..63d4cad29 100644
--- a/java/com/android/dialer/main/impl/res/values/styles.xml
+++ b/java/com/android/dialer/main/impl/res/values/styles.xml
@@ -21,6 +21,7 @@
     <item name="colorPrimary">@color/dialer_theme_color</item>
     <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item>
     <item name="colorPrimaryDark">@color/dialer_theme_color_dark</item>
+    <item name="android:windowLightStatusBar">true</item>
   </style>
 
   <!-- Activities should use this theme as their style -->
diff --git a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
index 9a181b2f0..1d9ef699e 100644
--- a/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
+++ b/java/com/android/dialer/theme/base/res/values/theme_dialer_light.xml
@@ -28,6 +28,7 @@
     <item name="actionBarTheme">@style/DialerActionBarBaseTheme</item>
     <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
 
+    <item name="android:colorPrimaryDark">@color/settings_primary_dark</item>
     <item name="colorControlHighlight">@color/dialer_ripple_color</item>
   </style>
 
diff --git a/java/com/android/dialer/theme/common/res/values-night/colors.xml b/java/com/android/dialer/theme/common/res/values-night/colors.xml
new file mode 100644
index 000000000..aa42d8b88
--- /dev/null
+++ b/java/com/android/dialer/theme/common/res/values-night/colors.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2012 The Android Open Source 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
+  -->
+<!-- The colors in this file aren't configured at the theme level. -->
+<resources>
+  <!-- Settings -->
+  <color name="dialer_settings_theme_color_dark">#1C3AA9</color>
+</resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml b/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
index 38a17c5ce..74cbb89c5 100644
--- a/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
+++ b/java/com/android/dialer/theme/hidden/res/values-night/colors_dialer_dark.xml
@@ -17,7 +17,7 @@
   <!-- Essential theme colors -->
   <color name="dialer_theme_color">#5195EA</color>
   <color name="dialer_theme_color_20pct">#335195EA</color>
-  <color name="dialer_theme_color_dark">#2374CE</color>
   <color name="dialer_secondary_color">#5195EA</color>
   <color name="dialer_ripple_color">#33ffffff</color>
+  <color name="settings_primary_dark">#2374CE</color>
 </resources>
diff --git a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
index e688ee149..4aa0b121c 100644
--- a/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
+++ b/java/com/android/dialer/theme/hidden/res/values/colors_dialer_light.xml
@@ -17,8 +17,9 @@
   <!-- Essential theme colors -->
   <color name="dialer_theme_color">#2A56C6</color>
   <color name="dialer_theme_color_20pct">#332A56C6</color>
-  <color name="dialer_theme_color_dark">#1C3AA9</color>
+  <color name="dialer_theme_color_dark">@color/dialer_background_color</color>
   <color name="dialer_secondary_color">#F50057</color>
   <color name="dialer_background_color">#FAFAFA</color>
   <color name="dialer_ripple_color">#1f000000</color>
+  <color name="settings_primary_dark">#1C3AA9</color>
 </resources>
-- 
cgit v1.2.3