diff options
| author | 2021-08-14 18:12:06 +0000 | |
|---|---|---|
| committer | 2021-08-14 18:12:06 +0000 | |
| commit | c9ce62c06bd96f7b1ce915353ef03ec57fe411fb (patch) | |
| tree | 665b2916de13789c4cd3cc4df1623bc8f2196100 | |
| parent | 922fe0da54a504bf97ceacf9ea434cb52c4f522c (diff) | |
| parent | 23dd0bd4a1041e87efa40a4e7b9507f551f7d5ca (diff) | |
Merge "Set CollapsingToolbar Title textColor" into sc-dev
3 files changed, 6 insertions, 0 deletions
diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/styles.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/styles.xml index bda51b5160c8..d0b6c4d54bb1 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 e8fd4b24b629..c20690342c19 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 0f20ec326e74..04010985fe74 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> |