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

Commit 2f69e9ff authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Manage/Clear all pill color" into sc-dev

parents a900a21a ff988dc8

packages/SystemUI/res/drawable/notif_footer_btn_background.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -15,10 +15,12 @@ 
  ~ limitations under the License.

  ~ limitations under the License.

  -->

  -->







<shape xmlns:android="http://schemas.android.com/apk/res/android"

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

    android:shape="rectangle">

    <solid

    <solid

        android:color="@color/notif_pill_background"

        android:color="?androidprv:attr/colorSurface"

        />

        />

    <corners android:radius="20dp" />

    <corners android:radius="20dp" />

packages/SystemUI/res/layout/status_bar_notification_footer.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ 
            android:layout_gravity="end"

            android:layout_gravity="end"

            android:background="@drawable/notif_footer_btn_background"

            android:background="@drawable/notif_footer_btn_background"

            android:focusable="true"

            android:focusable="true"

            android:textColor="@color/notif_pill_text"

            android:contentDescription="@string/accessibility_clear_all"

            android:contentDescription="@string/accessibility_clear_all"

            android:text="@string/clear_all_notifications_text"

            android:text="@string/clear_all_notifications_text"

        />

        />

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ 
    <!-- 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="notif_pill_background">@*android:color/surface_dark</color>

    <color name="notif_pill_text">@android:color/system_neutral1_50</color>

    <color name="notif_pill_text">@android:color/system_neutral1_50</color>





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

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

packages/SystemUI/res/values/colors.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -157,7 +157,6 @@ 
    <color name="minimize_dock_shadow_end">#00000000</color>

    <color name="minimize_dock_shadow_end">#00000000</color>





    <color name="default_remote_input_background">@*android:color/notification_default_color</color>

    <color name="default_remote_input_background">@*android:color/notification_default_color</color>

    <color name="notif_pill_background">@*android:color/surface_light</color>

    <color name="notif_pill_text">@android:color/system_neutral1_900</color>

    <color name="notif_pill_text">@android:color/system_neutral1_900</color>

    <color name="remote_input_accent">?android:attr/colorAccent</color>

    <color name="remote_input_accent">?android:attr/colorAccent</color>