From 80a44401a22344f7eabce6976372ab144ef22893 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Sat, 15 Jan 2011 16:22:24 -0800
Subject: [PATCH] Need to update the largeIcon for notifications when we're
 reapplying the views.

Bug: 3298062
Change-Id: I6bb72c0b93e00a9de8cc2633ac07add0a572a20f
---
 .../systemui/statusbar/NotificationData.java   |   3 +++
 .../statusbar/tablet/TabletStatusBar.java      |  17 ++++++++++++-----
 .../StatusBar/res/drawable-mdpi/pineapple2.png | Bin 0 -> 11577 bytes
 .../res/layout/notification_builder_test.xml   |   7 ++++++-
 .../statusbartest/NotificationBuilderTest.java |  13 ++++++++++++-
 5 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 tests/StatusBar/res/drawable-mdpi/pineapple2.png

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
index 7e8a5c19cf579..004174ee611ad 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar;
 import android.app.Notification;
 import android.os.IBinder;
 import android.view.View;
+import android.widget.ImageView;
 
 import com.android.internal.statusbar.StatusBarNotification;
 
@@ -36,6 +37,7 @@ public class NotificationData {
         public View row; // the outer expanded view
         public View content; // takes the click events and sends the PendingIntent
         public View expanded; // the inflated RemoteViews
+        public ImageView largeIcon;
         public Entry() {}
         public Entry(IBinder key, StatusBarNotification n, StatusBarIconView ic) {
             this.key = key;
@@ -88,6 +90,7 @@ public class NotificationData {
         entry.content = content;
         entry.expanded = expanded;
         entry.icon = icon;
+        entry.largeIcon = null; // TODO add support for large icons
         return add(entry);
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
index af730fef300f1..d8e3053ff68fb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -635,16 +635,15 @@ public class TabletStatusBar extends StatusBar implements
 
         // Can we just reapply the RemoteViews in place?  If when didn't change, the order
         // didn't change.
-        boolean contentsUnchanged = notification.isOngoing() == oldNotification.isOngoing()
-                && oldEntry.expanded != null
-                && contentView != null
-                && oldContentView != null
+        boolean contentsUnchanged = oldEntry.expanded != null
+                && contentView != null && oldContentView != null
                 && contentView.getPackage() != null
                 && oldContentView.getPackage() != null
                 && oldContentView.getPackage().equals(contentView.getPackage())
                 && oldContentView.getLayoutId() == contentView.getLayoutId();
         ViewGroup rowParent = (ViewGroup) oldEntry.row.getParent();
-        boolean orderUnchanged = notification.notification.when==oldNotification.notification.when;
+        boolean orderUnchanged = notification.notification.when==oldNotification.notification.when
+                && notification.isOngoing() == oldNotification.isOngoing();
         boolean isLastAnyway = rowParent.indexOfChild(oldEntry.row) == rowParent.getChildCount()-1;
         if (contentsUnchanged && (orderUnchanged || isLastAnyway)) {
             if (DEBUG) Slog.d(TAG, "reusing notification for key: " + key);
@@ -668,6 +667,13 @@ public class TabletStatusBar extends StatusBar implements
                     handleNotificationError(key, notification, "Couldn't update icon: " + ic);
                     return;
                 }
+                // Update the large icon
+                if (notification.notification.largeIcon != null) {
+                    oldEntry.largeIcon.setImageBitmap(notification.notification.largeIcon);
+                } else {
+                    oldEntry.largeIcon.getLayoutParams().width = 0;
+                    oldEntry.largeIcon.setVisibility(View.INVISIBLE);
+                }
 
                 if (key == mNotificationPeekKey) {
                     // must update the peek window
@@ -1286,6 +1292,7 @@ public class TabletStatusBar extends StatusBar implements
         entry.row = row;
         entry.content = content;
         entry.expanded = expanded;
+        entry.largeIcon = largeIcon;
 
         return true;
     }
diff --git a/tests/StatusBar/res/drawable-mdpi/pineapple2.png b/tests/StatusBar/res/drawable-mdpi/pineapple2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddc103803b6d8796ea2575fe5c003fd08509b540
GIT binary patch
literal 11577
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

literal 0
HcmV?d00001

diff --git a/tests/StatusBar/res/layout/notification_builder_test.xml b/tests/StatusBar/res/layout/notification_builder_test.xml
index 1b27e97880ce7..3c37a733c400e 100644
--- a/tests/StatusBar/res/layout/notification_builder_test.xml
+++ b/tests/StatusBar/res/layout/notification_builder_test.xml
@@ -238,7 +238,7 @@
                         />
                 <RadioButton
                         android:id="@+id/when_midnight"
-                        style="@style/FieldContents.Disabled"
+                        style="@style/FieldContents"
                         android:text="midnight"
                         />
                 <RadioButton
@@ -604,6 +604,11 @@
                         style="@style/FieldContents"
                         android:text="pineapple"
                         />
+                <RadioButton
+                        android:id="@+id/large_icon_pineapple2"
+                        style="@style/FieldContents"
+                        android:text="pineapple2"
+                        />
             </RadioGroup>
             
 
diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java b/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java
index e9a3513caf069..5a2ebacefa44b 100644
--- a/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java
+++ b/tests/StatusBar/src/com/android/statusbartest/NotificationBuilderTest.java
@@ -16,6 +16,8 @@
 
 package com.android.statusbartest;
 
+import java.util.GregorianCalendar;
+
 import android.app.Activity;
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -190,8 +192,14 @@ public class NotificationBuilderTest extends Activity
 
         // when
         switch (getRadioChecked(R.id.group_when)) {
-            case R.id.when_midnight:
+            case R.id.when_midnight: {
+                GregorianCalendar c = new GregorianCalendar();
+                c.set(GregorianCalendar.HOUR_OF_DAY, 0);
+                c.set(GregorianCalendar.MINUTE, 0);
+                c.set(GregorianCalendar.SECOND, 0);
+                b.setWhen(c.getTimeInMillis());
                 break;
+            }
             case R.id.when_now:
                 b.setWhen(System.currentTimeMillis());
                 break;
@@ -276,6 +284,9 @@ public class NotificationBuilderTest extends Activity
             case R.id.large_icon_pineapple:
                 b.setLargeIcon(loadBitmap(R.drawable.pineapple));
                 break;
+            case R.id.large_icon_pineapple2:
+                b.setLargeIcon(loadBitmap(R.drawable.pineapple2));
+                break;
         }
 
         // sound TODO