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

Deal with broken notifications.

Browse Source 
Change-Id: I21582ba4db70677f411a7e14bcdd7eac7d5a643e
This commit is contained in:
Joe Onorato
2010-05-24 20:02:53 -04:00
parent 871bdb9867
commit 9c1d823465
2 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/StatusBarPhone/src/com/android/policy/statusbar/phone/NotificationData.java
View File

@@ -32,8 +32,9 @@ public class NotificationData {
public IBinder key; public IBinder key;
public StatusBarNotification notification; public StatusBarNotification notification;
public StatusBarIconView icon; public StatusBarIconView icon;
public View expanded; // the outer expanded view public View row; // the outer expanded view
public View contents; // the inflated RemoteViews public View content; // takes the click events and sends the PendingIntent
public View expanded; // the inflated RemoteViews
} }
private final ArrayList<Entry> mEntries = new ArrayList<Entry>(); private final ArrayList<Entry> mEntries = new ArrayList<Entry>();
@@ -56,11 +57,13 @@ public class NotificationData {
return -1; return -1;
} }
public int add(IBinder key, StatusBarNotification notification, View expanded, public int add(IBinder key, StatusBarNotification notification, View row, View content,
StatusBarIconView icon) { View expanded, StatusBarIconView icon) {
Entry entry = new Entry(); Entry entry = new Entry();
entry.key = key; entry.key = key;
entry.notification = notification; entry.notification = notification;
entry.row = row;
entry.content = content;
entry.expanded = expanded; entry.expanded = expanded;
entry.icon = icon; entry.icon = icon;
final int index = chooseIndex(notification.notification.when); final int index = chooseIndex(notification.notification.when);
@@ -95,7 +98,14 @@ public class NotificationData {
* Return whether there are any visible items (i.e. items without an error). * Return whether there are any visible items (i.e. items without an error).
*/ */
public boolean hasVisibleItems() { public boolean hasVisibleItems() {
return mEntries.size() != 0; // TODO final int N = mEntries.size();
for (int i=0; i<N; i++) {
Entry entry = mEntries.get(i);
if (entry.expanded != null) { // the view successfully inflated
return true;
}
}
return false;
} }
/** /**
@@ -105,9 +115,10 @@ public class NotificationData {
final int N = mEntries.size(); final int N = mEntries.size();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
Entry entry = mEntries.get(i); Entry entry = mEntries.get(i);
// TODO: if (!entry.error) if (entry.expanded != null) { // the view successfully inflated
if ((entry.notification.notification.flags & Notification.FLAG_NO_CLEAR) == 0) { if ((entry.notification.notification.flags & Notification.FLAG_NO_CLEAR) == 0) {
return true; return true;
}
} }
} }
return false; return false;

41
packages/StatusBarPhone/src/com/android/policy/statusbar/phone/PhoneStatusBarService.java
View File

@@ -354,7 +354,7 @@ public class PhoneStatusBarService extends StatusBarService {
// didn't change. // didn't change.
if (notification.notification.when == oldNotification.notification.when if (notification.notification.when == oldNotification.notification.when
&& notification.isOngoing() == oldNotification.isOngoing() && notification.isOngoing() == oldNotification.isOngoing()
&& oldEntry.contents != null && oldEntry.expanded != null
&& contentView != null && oldContentView != null && contentView != null && oldContentView != null
&& contentView.getPackage() != null && contentView.getPackage() != null
&& oldContentView.getPackage() != null && oldContentView.getPackage() != null
@@ -364,19 +364,17 @@ public class PhoneStatusBarService extends StatusBarService {
oldEntry.notification = notification; oldEntry.notification = notification;
try { try {
// Reapply the RemoteViews // Reapply the RemoteViews
contentView.reapply(this, oldEntry.contents); contentView.reapply(this, oldEntry.content);
// update the contentIntent // update the contentIntent
ViewGroup clickView = (ViewGroup)oldEntry.expanded.findViewById(
com.android.internal.R.id.content);
final PendingIntent contentIntent = notification.notification.contentIntent; final PendingIntent contentIntent = notification.notification.contentIntent;
if (contentIntent != null) { if (contentIntent != null) {
clickView.setOnClickListener(new Launcher(contentIntent, notification.pkg, oldEntry.content.setOnClickListener(new Launcher(contentIntent,
notification.tag, notification.id)); notification.pkg, notification.tag, notification.id));
} }
} }
catch (RuntimeException e) { catch (RuntimeException e) {
// It failed to add cleanly. Log, and remove the view from the panel. // It failed to add cleanly. Log, and remove the view from the panel.
Slog.w(TAG, "couldn't reapply views for package " + contentView.getPackage(), e); Slog.w(TAG, "Couldn't reapply views for package " + contentView.getPackage(), e);
removeNotificationViews(key); removeNotificationViews(key);
addNotificationViews(key, notification); addNotificationViews(key, notification);
} }
@@ -418,7 +416,7 @@ public class PhoneStatusBarService extends StatusBarService {
return (ongoingSize + latestSize) - index - 1; return (ongoingSize + latestSize) - index - 1;
} }
View makeNotificationView(StatusBarNotification notification, ViewGroup parent) { View[] makeNotificationView(StatusBarNotification notification, ViewGroup parent) {
Notification n = notification.notification; Notification n = notification.notification;
RemoteViews remoteViews = n.contentView; RemoteViews remoteViews = n.contentView;
if (remoteViews == null) { if (remoteViews == null) {
@@ -440,23 +438,23 @@ public class PhoneStatusBarService extends StatusBarService {
notification.tag, notification.id)); notification.tag, notification.id));
} }
View child = null; View expanded = null;
Exception exception = null; Exception exception = null;
try { try {
child = remoteViews.apply(this, content); expanded = remoteViews.apply(this, content);
} }
catch (RuntimeException e) { catch (RuntimeException e) {
exception = e; exception = e;
} }
if (child == null) { if (expanded == null) {
Slog.e(TAG, "couldn't inflate view for package " + notification.pkg, exception); Slog.e(TAG, "couldn't inflate view for package " + notification.pkg, exception);
return null; row.setVisibility(View.GONE);
} else {
content.addView(expanded);
row.setDrawingCacheEnabled(true);
} }
content.addView(child);
row.setDrawingCacheEnabled(true); return new View[] { row, content, expanded };
return row;
} }
void addNotificationViews(IBinder key, StatusBarNotification notification) { void addNotificationViews(IBinder key, StatusBarNotification notification) {
@@ -471,15 +469,18 @@ public class PhoneStatusBarService extends StatusBarService {
parent = mLatestItems; parent = mLatestItems;
} }
// Construct the expanded view. // Construct the expanded view.
final View view = makeNotificationView(notification, parent); final View[] views = makeNotificationView(notification, parent);
final View row = views[0];
final View content = views[1];
final View expanded = views[2];
// Construct the icon. // Construct the icon.
StatusBarIconView iconView = new StatusBarIconView(this, StatusBarIconView iconView = new StatusBarIconView(this,
notification.pkg + "/" + notification.id); notification.pkg + "/" + notification.id);
iconView.set(new StatusBarIcon(notification.pkg, notification.notification.icon, iconView.set(new StatusBarIcon(notification.pkg, notification.notification.icon,
notification.notification.iconLevel, notification.notification.number)); notification.notification.iconLevel, notification.notification.number));
// Add the expanded view. // Add the expanded view.
final int viewIndex = list.add(key, notification, view, iconView); final int viewIndex = list.add(key, notification, row, content, expanded, iconView);
parent.addView(view, viewIndex); parent.addView(row, viewIndex);
// Add the icon. // Add the icon.
final int iconIndex = chooseIconIndex(isOngoing, viewIndex); final int iconIndex = chooseIconIndex(isOngoing, viewIndex);
mNotificationIcons.addView(iconView, iconIndex, mNotificationIcons.addView(iconView, iconIndex,
@@ -496,7 +497,7 @@ public class PhoneStatusBarService extends StatusBarService {
} }
} }
// Remove the expanded view. // Remove the expanded view.
((ViewGroup)entry.expanded.getParent()).removeView(entry.expanded); ((ViewGroup)entry.row.getParent()).removeView(entry.row);
// Remove the icon. // Remove the icon.
((ViewGroup)entry.icon.getParent()).removeView(entry.icon); ((ViewGroup)entry.icon.getParent()).removeView(entry.icon);
} }