diff options
| author | Selim Cinek <cinek@google.com> | 2020-03-20 17:18:52 -0700 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2020-03-21 00:23:15 +0000 |
| commit | d2dcd46518d7e68fa4d27f858d711f64ebd62765 (patch) | |
| tree | 5beca0f60b4ac6b9ad777d39d2a7cddfb1f0267c /core/java/android/app/Notification.java | |
| parent | ecf248f633199ba84467cec05f8cc449608a6dd2 (diff) | |
Fixed an issue where the largeIcon wouldn't be shown for non-shortcuts
We should only use the shortcut icon if it's available
Bug: 150905003
Test: add group message from Notify with largeIcon
Change-Id: Icd5b0991b34fbfb517344cc6c908a2588973cdca
Diffstat (limited to 'core/java/android/app/Notification.java')
| -rw-r--r-- | core/java/android/app/Notification.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index b58a85e9b985..36898ec922d0 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -7585,7 +7585,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) |