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

Commit a12f957b authored by Jeff DeCew's avatar Jeff DeCew Committed by Android (Google) Code Review
Browse files

Merge changes I237e0f04,I51ef1c1a into sc-dev 

* changes:
  Fix the (still disabled) logic for re-theming custom view notifications
  Clean up the material notification theme definition.
parents 869d848e 8e7341df

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

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




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

    <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_row_divider">@color/list_divider_color_dark</color>

    <color name="chooser_gradient_background">@color/loading_gradient_background_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>

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

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

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

    </style>





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

    <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>
 
</resources>
 
 No newline at end of file

core/res/res/values/colors.xml

+4 −0
Original line number Original line 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_dark">@color/primary_text_default_material_light</color>

    <color name="notification_default_color_light">#a3202124</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_default_color">#757575</color> <!-- Gray 600 -->





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

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

core/res/res/values/styles_material.xml

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

    </style>





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

    <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>

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

    </style>

    </style>





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

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





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

    <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="fontFamily">sans-serif-medium</item>

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

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

    </style>

    </style>





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

    <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="fontFamily">sans-serif-medium</item>

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

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

    </style>

    </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.Time" parent="TextAppearance.Material.Notification.Info" />





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

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

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

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

    </style>





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

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

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

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

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationCustomViewWrapper.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper { 




        // Custom views will most likely use just white or black as their text color.

        // Custom views will most likely use just white or black as their text color.

        // We need to scan through and replace these colors by Material NEXT colors.

        // We need to scan through and replace these colors by Material NEXT colors.

        ensureThemeOnChildren();

        ensureThemeOnChildren(mView);





        // Let's invert the notification colors when we're in night mode and

        // Let's invert the notification colors when we're in night mode and

        // the notification background isn't colorized.

        // the notification background isn't colorized.