Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel Sandler
2012-04-09 12:00:52 -07:00
committed by Android (Google) Code Review
parent c1c2ca0cc6 84920cc56e
commit a379eeca24
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -591,10 +591,14 @@ public class PhoneStatusBar extends BaseStatusBar {
}
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

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

@@ -867,9 +867,14 @@ public class TabletStatusBar extends BaseStatusBar implements
}
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