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

Merge changes I7dc8f5fd,Ia5262ca7 into rvc-dev am: 279238f3c2 am: 79487716c1

Browse Source 
Change-Id: Ic988b375919bab0055bdf7d1fa9fbf3443c5f2af
This commit is contained in:
Selim Cinek
2020-04-09 17:59:28 +00:00
committed by Automerger Merge Worker
parent e49624c80f 79487716c1
commit 71291644a8
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7589,10 +7589,8 @@ public class Notification implements Parcelable
>= Build.VERSION_CODES.P; >= Build.VERSION_CODES.P;
boolean isOneToOne; boolean isOneToOne;
CharSequence nameReplacement = null; CharSequence nameReplacement = null;
Icon avatarReplacement = null;
if (!atLeastP) { if (!atLeastP) {
isOneToOne = TextUtils.isEmpty(conversationTitle); isOneToOne = TextUtils.isEmpty(conversationTitle);
avatarReplacement = mBuilder.mN.mLargeIcon;
if (hasOnlyWhiteSpaceSenders()) { if (hasOnlyWhiteSpaceSenders()) {
isOneToOne = true; isOneToOne = true;
nameReplacement = conversationTitle; nameReplacement = conversationTitle;
@@ -7641,7 +7639,7 @@ public class Notification implements Parcelable
contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsCollapsed", contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsCollapsed",
isCollapsed); isCollapsed);
contentView.setIcon(R.id.status_bar_latest_event_content, "setAvatarReplacement", contentView.setIcon(R.id.status_bar_latest_event_content, "setAvatarReplacement",
avatarReplacement); mBuilder.mN.mLargeIcon);
contentView.setCharSequence(R.id.status_bar_latest_event_content, "setNameReplacement", contentView.setCharSequence(R.id.status_bar_latest_event_content, "setNameReplacement",
nameReplacement); nameReplacement);
contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsOneToOne", contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsOneToOne",

2
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationHeaderViewWrapper.java
View File

@@ -169,7 +169,7 @@ public class NotificationHeaderViewWrapper extends NotificationViewWrapper {
@Override @Override
public void onContentUpdated(ExpandableNotificationRow row) { public void onContentUpdated(ExpandableNotificationRow row) {
super.onContentUpdated(row); super.onContentUpdated(row);
mIsLowPriority = row.isLowPriority(); mIsLowPriority = row.getEntry().isAmbient();
mTransformLowPriorityTitle = !row.isChildInGroup() && !row.isSummaryWithChildren(); mTransformLowPriorityTitle = !row.isChildInGroup() && !row.isSummaryWithChildren();
ArraySet<View> previousViews = mTransformationHelper.getAllTransformingViews(); ArraySet<View> previousViews = mTransformationHelper.getAllTransformingViews();