Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01c0e576 authored by Yu-Ta Lu's avatar Yu-Ta Lu Committed by Automerger Merge Worker
Browse files

Merge "Set CollapsingToolbar Title textColor" into sc-dev am: c9ce62c0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15556995

Change-Id: I52b2570bed6d7e9b24955528d4222e3707e01b05
parents 9c58022d c9ce62c0

packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v31/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -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

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

+2 −0
Original line number Diff line number Diff line
@@ -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

packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>