Merge "Notification layout fixes:" into sc-dev am: 10de71a380

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14805134

Change-Id: I216b323adfc4c470a0aaf9f1690a6a1da6467314
This commit is contained in:
Jeff DeCew
2021-06-03 16:34:17 +00:00
committed by Automerger Merge Worker
5 changed files with 11 additions and 8 deletions

View File

@@ -5597,7 +5597,7 @@ public class Notification implements Parcelable
private void bindSnoozeAction(RemoteViews big, StandardTemplateParams p) {
boolean hideSnoozeButton = mN.isForegroundService() || mN.fullScreenIntent != null
|| isBackgroundColorized(p)
|| p.mViewType == StandardTemplateParams.VIEW_TYPE_HEADS_UP;
|| p.mViewType != StandardTemplateParams.VIEW_TYPE_BIG;
big.setBoolean(R.id.snooze_button, "setEnabled", !hideSnoozeButton);
if (hideSnoozeButton) {
// Only hide; NotificationContentView will show it when it adds the click listener