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

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

Merge changes I7b52d3b8,I4332fa81,I09aa1b19 into main 

* changes:
  Update colors & text in promoted notification info
  Hide Turn off & inline controls for promoted info
  Fix Dismiss button not appearing in promoted guts
parents 67dc8e82 6165b27a

packages/SystemUI/res/drawable/ic_keep_off.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  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

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960">

    <path

        android:pathData="M680,120v80h-40v327l-80,-80v-247L400,200v87l-87,-87 -33,-33v-47h400ZM480,920l-40,-40v-240L240,640v-80l80,-80v-46L56,168l56,-56 736,736 -58,56 -264,-264h-6v240l-40,40ZM354,560h92l-44,-44 -2,-2 -46,46ZM480,367ZM402,516Z"

        android:fillColor="#e3e3e3"/>

</vector>

packages/SystemUI/res/drawable/notification_guts_promoted_explain_bg.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/materialColorSurfaceContainerHighest" />



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



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

</shape>

packages/SystemUI/res/layout/promoted_notification_info.xml

+4 −7
Original line number Diff line number Diff line
@@ -315,9 +315,10 @@ asked for it --> 
            android:layout_height="wrap_content"

            android:minHeight="60dp"

            android:layout_marginTop="@dimen/notification_importance_button_separation"

            android:paddingTop="16dp"

            android:paddingHorizontal="16dp"

            android:gravity="center_vertical"

            android:background="@drawable/rounded_corners"

            android:backgroundTint="@androidprv:color/materialColorPrimaryContainer"

            android:background="@drawable/notification_guts_promoted_explain_bg"

            >

            <TextView

                android:id="@+id/promoted_explain_title"
@@ -326,9 +327,7 @@ asked for it --> 
                android:layout_height="wrap_content"

                android:layout_alignParentStart="true"

                android:gravity="start|center_vertical"

                android:padding="16dp"

                android:color="@androidprv:color/materialColorOnPrimary"

                style="@style/TextAppearance.NotificationInfo.Button"/>

                style="@style/TextAppearance.NotificationImportanceButton"/>

            <TextView

                android:id="@+id/promoted_explain"

                android:text="@string/live_notifications_desc"
@@ -337,7 +336,6 @@ asked for it --> 
                android:layout_below="@id/promoted_explain_title"

                android:gravity="start|center_vertical"

                android:maxWidth="200dp"

                android:padding="16dp"

                style="@style/TextAppearance.NotificationImportanceDetail"/>

            <TextView

                android:id="@+id/promoted_demote"
@@ -346,7 +344,6 @@ asked for it --> 
                android:layout_height="wrap_content"

                android:layout_below="@id/promoted_explain"

                android:layout_alignParentEnd="true"

                android:padding="16dp"

                android:gravity="start|center_vertical"

                android:minWidth="@dimen/notification_importance_toggle_size"

                android:minHeight="@dimen/notification_importance_toggle_size"

packages/SystemUI/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -428,6 +428,8 @@ 
    <dimen name="notification_2025_importance_button_padding_vertical">12dp</dimen>

    <dimen name="notification_2025_importance_button_padding_horizontal">16dp</dimen>



    <dimen name="notification_demote_button_icon_size">16sp</dimen>



    <!-- The minimum height for the snackbar shown after the snooze option has been chosen. -->

    <dimen name="snooze_snackbar_min_height">56dp</dimen>

packages/SystemUI/res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -2169,16 +2169,16 @@ 
    <string name="notification_inline_dismiss">Dismiss</string>



    <!-- [CHAR LIMIT=30] Text shown in button used to prevent app from showing Live Updates, for this notification and all future ones -->

    <string name="notification_inline_disable_promotion">Don\'t show as pinned</string>

    <string name="notification_inline_disable_promotion">Turn off</string>



    <!-- [CHAR LIMIT=30] Text shown in button used to prevent app from showing Live Updates, for this notification and all future ones -->

    <string name="notification_inline_disable_promotion_button">Block Live Updates from this app</string>



    <!-- Text accompanying the "Show live updates" switch explaining the purpose of the setting -->

    <string name="live_notifications_title">Showing Live Updates</string>

    <string name="live_notifications_title">Live updates</string>



    <!-- Text accompanying the "Show live updates" switch explaining the purpose of the setting -->

    <string name="live_notifications_desc">Pinned notifications display live info from apps, and always appear on the status bar and lock screen</string>

    <string name="live_notifications_desc">When turned off, ongoing notifications from this app won\'t be promoted on your lock screen and status bar</string>



    <!-- Notification: Control panel: Label that displays when the app's notifications cannot be blocked. -->

    <string name="notification_unblockable_desc">These notifications can\'t be modified.</string>