Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adapt margin for actionless notifs with snooze button"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-11-18 23:03:51 +00:00
committed by Android (Google) Code Review
parent d620436ba7 3ff7884df3
commit 6b4c503a24
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/Notification.java
View File

@@ -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;
@@ -5348,8 +5349,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, int viewType,