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

Merge "Fixed an issue where the largeIcon wouldn't be shown for non-shortcuts" into rvc-dev am: a3c47e791e am: 3eafed8c28

Browse Source 
Change-Id: Iae00d0288786bb92c0d5fe453f6916f76f793e91
This commit is contained in:
TreeHugger Robot
2020-03-21 03:40:44 +00:00
committed by Automerger Merge Worker
parent 3962493262 3eafed8c28
commit 97e1608405
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7584,7 +7584,9 @@ public class Notification implements Parcelable
}
boolean isConversationLayout = mConversationType != CONVERSATION_TYPE_LEGACY;
boolean isImportantConversation = mConversationType == CONVERSATION_TYPE_IMPORTANT;
Icon largeIcon = isConversationLayout ? mShortcutIcon : mBuilder.mN.mLargeIcon;
Icon largeIcon = isConversationLayout && mShortcutIcon != null
? mShortcutIcon
: mBuilder.mN.mLargeIcon;
TemplateBindResult bindResult = new TemplateBindResult();
StandardTemplateParams p = mBuilder.mParams.reset()
.hasProgress(false)