Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set CollapsingToolbar Title textColor" into sc-dev

Browse Source
This commit is contained in:
Yu-Ta Lu
2021-08-14 18:12:06 +00:00
committed by Android (Google) Code Review
parent 922fe0da54 23dd0bd4a1
commit c9ce62c06b
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/styles.xml
View File

@@ -18,9 +18,11 @@
<style name="CollapsingToolbarTitle.Collapsed" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"> <style name="CollapsingToolbarTitle.Collapsed" parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
<item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item> <item name="android:fontFamily">@string/settingslib_config_headlineFontFamily</item>
<item name="android:textSize">20dp</item> <item name="android:textSize">20dp</item>
<item name="android:textColor">@color/settingslib_text_color_primary_device_default</item>
</style> </style>
<style name="CollapsingToolbarTitle.Expanded" parent="CollapsingToolbarTitle.Collapsed"> <style name="CollapsingToolbarTitle.Expanded" parent="CollapsingToolbarTitle.Collapsed">
<item name="android:textSize">36dp</item> <item name="android:textSize">36dp</item>
<item name="android:textColor">@color/settingslib_text_color_primary_device_default</item>
</style> </style>
</resources> </resources>

2
packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml
View File

@@ -41,4 +41,6 @@
<!-- copy from accent_primary_variant_dark_device_default--> <!-- copy from accent_primary_variant_dark_device_default-->
<color name="settingslib_accent_primary_variant">@android:color/system_accent1_300</color> <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> </resources>

2
packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml
View File

@@ -63,4 +63,6 @@
<color name="settingslib_background_device_default_dark">@android:color/system_neutral1_900</color> <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_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> </resources>