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

Commit a6d0d293 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Clean up the material notification theme definition. 

Test: manual
Bug: 181048615
Change-Id: I51ef1c1aec829889ea0cbe32df82eb27bdbda656
parent 0dae8f70

core/res/res/values-night/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ 


    <color name="notification_default_color_dark">#ddffffff</color>



    <color name="notification_primary_text_color_current">@color/notification_primary_text_color_dark</color>

    <color name="notification_secondary_text_color_current">@color/notification_secondary_text_color_dark</color>

    <color name="notification_default_color_current">@color/notification_default_color_dark</color>



    <color name="chooser_row_divider">@color/list_divider_color_dark</color>

    <color name="chooser_gradient_background">@color/loading_gradient_background_color_dark</color>

    <color name="chooser_gradient_highlight">@color/loading_gradient_highlight_color_dark</color>

core/res/res/values-night/values.xml

+0 −5
Original line number Diff line number Diff line
@@ -28,9 +28,4 @@ 
    </style>



    <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="Theme.DeviceDefault.Dialog" />



    <style name="TextAppearance.Material.Notification">

        <item name="textColor">@color/notification_secondary_text_color_dark</item>

        <item name="textSize">@dimen/notification_text_size</item>

    </style>

</resources>
 
 No newline at end of file

core/res/res/values/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -143,6 +143,10 @@ 
    <color name="notification_default_color_dark">@color/primary_text_default_material_light</color>

    <color name="notification_default_color_light">#a3202124</color>



    <color name="notification_primary_text_color_current">@color/notification_primary_text_color_light</color>

    <color name="notification_secondary_text_color_current">@color/notification_secondary_text_color_light</color>

    <color name="notification_default_color_current">@color/notification_default_color_light</color>



    <color name="notification_default_color">#757575</color> <!-- Gray 600 -->



    <color name="notification_action_button_text_color">@color/notification_default_color</color>

core/res/res/values/styles_material.xml

+5 −4
Original line number Diff line number Diff line
@@ -466,18 +466,20 @@ please see styles_device_defaults.xml. 
    </style>



    <style name="TextAppearance.Material.Notification">

        <item name="textColor">@color/notification_secondary_text_color_light</item>

        <item name="textColor">@color/notification_secondary_text_color_current</item>

        <item name="textSize">@dimen/notification_text_size</item>

    </style>



    <style name="TextAppearance.Material.Notification.Reply" />



    <style name="TextAppearance.Material.Notification.Title">

        <item name="textColor">@color/notification_primary_text_color_current</item>

        <item name="fontFamily">sans-serif-medium</item>

        <item name="textSize">@dimen/notification_title_text_size</item>

    </style>



    <style name="TextAppearance.Material.Notification.BigTitle">

        <item name="textColor">@color/notification_primary_text_color_current</item>

        <item name="fontFamily">sans-serif-medium</item>

        <item name="textSize">@dimen/notification_big_title_text_size</item>

    </style>
@@ -492,9 +494,8 @@ please see styles_device_defaults.xml. 


    <style name="TextAppearance.Material.Notification.Time" parent="TextAppearance.Material.Notification.Info" />



    <style name="TextAppearance.Material.Notification.Emphasis">

        <item name="textColor">#66000000</item>

    </style>

    <!-- unused; keep identical to parent -->

    <style name="TextAppearance.Material.Notification.Emphasis"/>



    <style name="TextAppearance.Material.Notification.Conversation.AppName" parent="TextAppearance.Material.Notification.Title">

        <item name="android:textSize">16sp</item>