commit b5d323aec7885d728503cc080c6c5e5a20e5850c
author Ian Lake <ilake@google.com> Fri Sep 04 09:49:32 2015 -0700
committer Ian Lake <ilake@google.com> Fri Sep 04 17:08:26 2015 +0000
tree 1f542a681f1ed048c0ed18f78911d31b2885cf26
parent 05eb4c151d29215ffa679a78f80e698700899310

Ensure Compat MediaStyle Large Icons are shown pre-API 21

The large icon associated with a NotificationCompat.MediaStyle
notification will now always be shown if it available - previously
showing a MediaStyle notification without a large icon would cause
subsequent updates to the notification to ignore newly added
large icons on pre-API 21 devices due to the visibility not being
reset.

BUG: 23797074
Change-Id: Ia5e4c1bd840546f6504d3ccd8ac88e2780931f16

v7/appcompat/src/android/support/v7/internal/app/NotificationCompatImplBase.java

diff --git a/v7/appcompat/src/android/support/v7/internal/app/NotificationCompatImplBase.java b/v7/appcompat/src/android/support/v7/internal/app/NotificationCompatImplBase.java
index c52290dc..d77d3c4 100644
--- a/v7/appcompat/src/android/support/v7/internal/app/NotificationCompatImplBase.java
+++ b/v7/appcompat/src/android/support/v7/internal/app/NotificationCompatImplBase.java
@@ -173,6 +173,7 @@
         // On versions before Jellybean, the large icon was shown by SystemUI, so we need to hide
         // it here.
         if (largeIcon != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            contentView.setViewVisibility(R.id.icon, View.VISIBLE);
             contentView.setImageViewBitmap(R.id.icon, largeIcon);
         } else {
             contentView.setViewVisibility(R.id.icon, View.GONE);