From 3ff7884df3b04418a2266969ea5bd2a1a280facd Mon Sep 17 00:00:00 2001 From: Lyn Han Date: Fri, 13 Nov 2020 18:56:49 -0800 Subject: [PATCH] Adapt margin for actionless notifs with snooze button Bug: 171817112 Test: visual Expanded hun/shade/ls notif bottom margin looks good - with and without snooze button - with and without actions Change-Id: Ifbd57fcf699c431a51c0713ef54126e72d648614 --- core/java/android/app/Notification.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 4c08e759f3cf7..9f85979035e09 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -67,6 +67,7 @@ import android.os.Parcelable; import android.os.SystemClock; import android.os.SystemProperties; import android.os.UserHandle; +import android.provider.Settings; import android.text.BidiFormatter; import android.text.SpannableStringBuilder; import android.text.Spanned; @@ -5371,8 +5372,11 @@ public class Notification implements Parcelable big.setViewVisibility(R.id.notification_material_reply_text_3, View.GONE); big.setTextViewText(R.id.notification_material_reply_text_3, null); + final boolean snoozeEnabled = mContext.getContentResolver() != null + && (Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.SHOW_NOTIFICATION_SNOOZE, 0) == 1); big.setViewLayoutMarginBottomDimen(R.id.notification_action_list_margin_target, - R.dimen.notification_content_margin); + snoozeEnabled ? 0 : R.dimen.notification_content_margin); } private RemoteViews applyStandardTemplateWithActions(int layoutId,