From a5fb4ff050e926899c7e53d4814beb3a408c1c41 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Mon, 18 Jul 2022 15:46:13 -0400
Subject: [PATCH 1/2] Allow secondary summaries to wrap in entity header

Test: view notification channel page with a long NotificationChannel#description
Fixes: 232024654
Change-Id: I4af61a72a47a049d85e595489308090edd7101eb
---
 .../LayoutPreference/res/layout/settings_entity_header.xml      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml b/packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml
index 50f69d1d692a1..c629d96bcf4b8 100644
--- a/packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml
+++ b/packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml
@@ -71,6 +71,8 @@
         <TextView
             android:id="@+id/entity_header_second_summary"
             style="@style/TextAppearance.EntityHeaderSummary"
+            android:singleLine="false"
+            android:maxLines="4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 

From 4f57afc9275381d6585afb18242a5be8d1b80dd3 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 20 Jul 2022 15:18:39 -0400
Subject: [PATCH 2/2] Fix muteOnReturn behavior for snoozed notifications

By actually reading the muteOnReturn variable

Test: snooze a notification, ensure it comes back with sound
Fixes: 238941115
Change-Id: I984e796a8c502348033022ce5f4fd79ea64e2335
---
 .../server/notification/NotificationManagerService.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 9486a45e989e0..e589080786b55 100755
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -2459,11 +2459,11 @@ public class NotificationManagerService extends SystemService {
         SnoozeHelper snoozeHelper = new SnoozeHelper(getContext(), (userId, r, muteOnReturn) -> {
             try {
                 if (DBG) {
-                    Slog.d(TAG, "Reposting " + r.getKey());
+                    Slog.d(TAG, "Reposting " + r.getKey() + " " + muteOnReturn);
                 }
                 enqueueNotificationInternal(r.getSbn().getPackageName(), r.getSbn().getOpPkg(),
                         r.getSbn().getUid(), r.getSbn().getInitialPid(), r.getSbn().getTag(),
-                        r.getSbn().getId(),  r.getSbn().getNotification(), userId, true);
+                        r.getSbn().getId(),  r.getSbn().getNotification(), userId, muteOnReturn);
             } catch (Exception e) {
                 Slog.e(TAG, "Cannot un-snooze notification", e);
             }