Merge "Fix notifications transitioning from small->big."

Author: dsandler

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

@@ -591,10 +591,14 @@ public void updateNotification(IBinder key, StatusBarNotification notification)
         }
 
         final StatusBarNotification oldNotification = oldEntry.notification;
-        final RemoteViews oldContentView = oldNotification.notification.contentView;
-
-        final RemoteViews contentView = notification.notification.contentView;
 
+        // XXX: modify when we do something more intelligent with the two content views
+        final RemoteViews oldContentView = (oldNotification.notification.bigContentView != null) 
+                ? oldNotification.notification.bigContentView
+                : oldNotification.notification.contentView;
+        final RemoteViews contentView = (notification.notification.bigContentView != null) 
+                ? notification.notification.bigContentView
+                : notification.notification.contentView;
 
         if (DEBUG) {
             Slog.d(TAG, "old notification: when=" + oldNotification.notification.when

packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java

@@ -867,9 +867,14 @@ public void updateNotification(IBinder key, StatusBarNotification notification)
         }
 
         final StatusBarNotification oldNotification = oldEntry.notification;
-        final RemoteViews oldContentView = oldNotification.notification.contentView;
 
-        final RemoteViews contentView = notification.notification.contentView;
+        // XXX: modify when we do something more intelligent with the two content views
+        final RemoteViews oldContentView = (oldNotification.notification.bigContentView != null) 
+                ? oldNotification.notification.bigContentView
+                : oldNotification.notification.contentView;
+        final RemoteViews contentView = (notification.notification.bigContentView != null) 
+                ? notification.notification.bigContentView
+                : notification.notification.contentView;
 
         if (DEBUG) {
             Slog.d(TAG, "old notification: when=" + oldNotification.notification.when