diff options
author | 2022-07-21 11:18:09 +0000 | |
---|---|---|
committer | 2022-07-21 11:18:09 +0000 | |
commit | 0d0dfcd1172e6ecba2d29e3f3d4e97e71c9d4145 (patch) | |
tree | a43fb9f1fe2ccb575b552ef3ba847d968c1b3435 | |
parent | 70befc221db5323701db4a7ad64e4fcba8e5a9c5 (diff) | |
parent | 7dd9014b19c811755e3bfe9212cb2c17151b52e6 (diff) |
Merge changes I984e796a,I4af61a72 into tm-qpr-dev am: 7dd9014b19
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19358973
Change-Id: I54e6dc9d41ea36d43d2f9e8474cc27362203e0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml | 2 | ||||
-rwxr-xr-x | services/core/java/com/android/server/notification/NotificationManagerService.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml b/packages/SettingsLib/LayoutPreference/res/layout/settings_entity_header.xml index 50f69d1d692a..c629d96bcf4b 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"/> diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 9486a45e989e..e589080786b5 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); } |