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

Commit 3fd1b494 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Colors updates for guts 

For a11y and night mode and night mode a11y

Fixes: 129507563
Test: manual
Change-Id: I0b472db88feddb6f92aa265524e84afbe30c824b
parent 3140044c

packages/SystemUI/res/drawable/button_border_selected.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <solid

    <solid

        android:color="@color/notification_guts_selection_bg" />

        android:color="@color/notification_guts_selection_bg" />

    <stroke

    <stroke

        android:width="2dp"

        android:width="1dp"

        android:color="@color/GM2_grey_300"/>

        android:color="@color/GM2_grey_300"/>

    <corners android:radius="@dimen/rect_button_radius" />

    <corners android:radius="@dimen/rect_button_radius" />

</shape>
 
</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/button_border_unselected.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
       android:shape="rectangle"

       android:shape="rectangle"

       android:color="@color/notification_guts_selection_bg">

       android:color="@color/notification_guts_selection_bg">

    <stroke

    <stroke

        android:width="2dp"

        android:width="1dp"

        android:color="@color/GM2_grey_300"/>

        android:color="@color/GM2_grey_300"/>





    <corners android:radius="@dimen/rect_button_radius" />

    <corners android:radius="@dimen/rect_button_radius" />

packages/SystemUI/res/values-night/colors.xml

+6 −5
Original line number Original line Diff line number Diff line
@@ -37,16 +37,17 @@ 
    <color name="notification_ripple_untinted_color">#30ffffff</color>

    <color name="notification_ripple_untinted_color">#30ffffff</color>





    <!-- The "inside" of a notification, reached via longpress -->

    <!-- The "inside" of a notification, reached via longpress -->

    <color name="notification_guts_bg_color">@*android:color/notification_material_background_color</color>

    <color name="notification_guts_bg_color">@color/GM2_grey_900</color>





    <!-- The color of the text inside a notification -->

    <!-- The color of the text inside a notification -->

    <color name="notification_primary_text_color">@*android:color/notification_primary_text_color_dark</color>

    <color name="notification_primary_text_color">@*android:color/notification_primary_text_color_dark</color>





    <color name="notification_guts_selection_bg">#202124</color>

    <color name="notification_guts_selection_bg">@color/GM2_grey_800</color>

    <color name="notification_guts_selection_border">#669DF6</color>

    <color name="notification_guts_selection_border">@color/GM2_grey_700</color>

    <color name="notification_guts_link_icon_tint">@color/GM2_grey_200</color>

    <color name="notification_guts_link_icon_tint">@color/GM2_grey_500</color>

    <color name="notification_guts_sub_text_color">@color/GM2_grey_200</color>

    <color name="notification_guts_sub_text_color">@color/GM2_grey_200</color>

    <color name="notification_guts_header_text_color">@color/GM2_grey_100</color>

    <color name="notification_guts_header_text_color">@color/GM2_grey_200</color>

    <color name="notification_guts_button_color">@color/GM2_blue_200</color>





    <!-- The color of the background in the top part of QSCustomizer -->

    <!-- The color of the background in the top part of QSCustomizer -->

    <color name="qs_customize_background">@color/GM2_grey_900</color>

    <color name="qs_customize_background">@color/GM2_grey_900</color>

packages/SystemUI/res/values/colors.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -95,6 +95,7 @@ 
    <color name="notification_guts_header_text_color">@color/GM2_grey_900</color>

    <color name="notification_guts_header_text_color">@color/GM2_grey_900</color>

    <color name="notification_silence_color">#FF32c1de</color>

    <color name="notification_silence_color">#FF32c1de</color>

    <color name="notification_alert_color">#FFF87B2B</color>

    <color name="notification_alert_color">#FFF87B2B</color>

    <color name="notification_guts_button_color">@color/GM2_blue_700</color>





    <color name="assist_orb_color">#ffffff</color>

    <color name="assist_orb_color">#ffffff</color>
@@ -177,6 +178,9 @@ 
    <color name="GM2_red_300">#F28B82</color>

    <color name="GM2_red_300">#F28B82</color>

    <color name="GM2_red_500">#B71C1C</color>

    <color name="GM2_red_500">#B71C1C</color>





    <color name="GM2_blue_200">#AECBFA</color>

    <color name="GM2_blue_700">#1967D2</color>



    <color name="GM2_yellow_500">#FFFBBC04</color>

    <color name="GM2_yellow_500">#FFFBBC04</color>

    <color name="GM2_green_500">#FF34A853</color>

    <color name="GM2_green_500">#FF34A853</color>

</resources>
 
</resources>

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -452,7 +452,7 @@ 
    <style name="TextAppearance.NotificationInfo.Button">

    <style name="TextAppearance.NotificationInfo.Button">

        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>

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

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

        <item name="android:textColor">?android:attr/colorAccent</item>

        <item name="android:textColor">@color/notification_guts_button_color</item>

        <item name="android:background">@drawable/btn_borderless_rect</item>

        <item name="android:background">@drawable/btn_borderless_rect</item>

        <item name="android:gravity">center_vertical</item>

        <item name="android:gravity">center_vertical</item>

        <item name="android:focusable">true</item>

        <item name="android:focusable">true</item>