From 23dd0bd4a1041e87efa40a4e7b9507f551f7d5ca Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Sat, 14 Aug 2021 00:01:05 +0800
Subject: [PATCH] Set CollapsingToolbar Title textColor

The original title color seems to be set incorrectly for all OEM
devices except for Pixel. This change stabilizes the color.

Bug: 196106314
Bug: 196614394
Test: manual test
Change-Id: I2b9f7ddec17d1d447cb7348e8f96cabb81e2e229
---
 .../CollapsingToolbarBaseActivity/res/values-v31/styles.xml     | 2 ++
 .../SettingsLib/SettingsTheme/res/values-night-v31/colors.xml   | 2 ++
 packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/styles.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/styles.xml
index bda51b5160c8a..d0b6c4d54bb1f 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/styles.xml
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/styles.xml
@@ -18,9 +18,11 @@
     <style name="CollapsingToolbarTitle.Collapsed" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
         <item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>
         <item name="android:textSize">20dp</item>
+        <item name="android:textColor">@color/settingslib_text_color_primary_device_default</item>
     </style>
 
     <style name="CollapsingToolbarTitle.Expanded" parent="CollapsingToolbarTitle.Collapsed">
         <item name="android:textSize">36dp</item>
+        <item name="android:textColor">@color/settingslib_text_color_primary_device_default</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml
index e8fd4b24b629e..c20690342c197 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml
@@ -41,4 +41,6 @@
 
     <!-- copy from accent_primary_variant_dark_device_default-->
     <color name="settingslib_accent_primary_variant">@android:color/system_accent1_300</color>
+
+    <color name="settingslib_text_color_primary_device_default">@android:color/system_neutral1_50</color>
 </resources>
\ No newline at end of file
diff --git a/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml
index 0f20ec326e74d..04010985fe747 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml
@@ -63,4 +63,6 @@
     <color name="settingslib_background_device_default_dark">@android:color/system_neutral1_900</color>
 
     <color name="settingslib_background_device_default_light">@android:color/system_neutral1_50</color>
+
+    <color name="settingslib_text_color_primary_device_default">@android:color/system_neutral1_900</color>
 </resources>