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

Browse Source 
Change-Id: I473c39c62f771f2957bf946e0625b2439c7f68b8
This commit is contained in:
TreeHugger Robot
2020-03-21 03:15:39 +00:00
committed by Automerger Merge Worker
parent 310f6b4243 a3c47e791e
commit 3eafed8c28
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 isConversationLayout = mConversationType != CONVERSATION_TYPE_LEGACY;
boolean isImportantConversation = mConversationType == CONVERSATION_TYPE_IMPORTANT; 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(); TemplateBindResult bindResult = new TemplateBindResult();
StandardTemplateParams p = mBuilder.mParams.reset() StandardTemplateParams p = mBuilder.mParams.reset()
.hasProgress(false) .hasProgress(false)