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

Commit b23fee0c authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android (Google) Code Review
Browse files

Merge changes I4991b410,I23aab363,Ifb024baf into main 

* changes:
  [Notif redesign] Update text style in guts priority btn
  [Notif redesign] Adjust corner radius of guts priority btn
  [Notif redesign] Update fonts in guts header
parents 197713b9 74432f49

packages/SystemUI/res/drawable/notification_2025_guts_priority_button_bg.xml

+4 −11
Original line number Diff line number Diff line
@@ -14,14 +14,7 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

       android:shape="rectangle" >

    <solid

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



    <stroke

        android:width="1.5dp"

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



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

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

    <item android:state_selected="true" android:drawable="@drawable/notification_2025_guts_priority_button_bg_selected" />

    <item android:drawable="@drawable/notification_2025_guts_priority_button_bg_unselected" />

</selector>

packages/SystemUI/res/drawable/notification_2025_guts_priority_button_bg_selected.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2025 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

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

       android:shape="rectangle" >

    <solid android:color="@androidprv:color/materialColorSecondaryContainer" />



    <stroke android:width="1dp" android:color="@androidprv:color/materialColorOutline"  />



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

</shape>

packages/SystemUI/res/drawable/notification_2025_guts_priority_button_bg_unselected.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2025 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

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

       android:shape="rectangle" >

    <solid android:color="@color/transparent" />



    <stroke android:width="1dp" android:color="@androidprv:color/materialColorOutlineVariant"  />



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

</shape>

packages/SystemUI/res/layout/notification_2025_conversation_info.xml

+3 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_important_outline"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:focusable="false"/>

                <LinearLayout
@@ -286,7 +286,7 @@ 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_notifications_alert"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:focusable="false"/>

                <LinearLayout
@@ -339,7 +339,7 @@ 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_notifications_silence"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:focusable="false"/>

                <LinearLayout

packages/SystemUI/res/layout/notification_2025_info.xml

+3 −3
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_notifications_automatic"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:focusable="false"/>

                <LinearLayout
@@ -236,7 +236,7 @@ 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_notifications_alert"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:focusable="false"/>

                <LinearLayout
@@ -286,7 +286,7 @@ 
                    android:id="@+id/silence_icon"

                    android:src="@drawable/ic_notifications_silence"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:layout_gravity="center"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"