am 89304586: Merge "Retain expanded state across violent updates." into jb-dev

* commit '8930458639527448429362255af96e94f5aba5ed':
  Retain expanded state across violent updates.
This commit is contained in:
Chris Wren
2012-06-28 04:33:07 -07:00
committed by Android Git Automerger

View File

@@ -907,8 +907,13 @@ public abstract class BaseStatusBar extends SystemUI implements
if (DEBUG) Slog.d(TAG, "contents was " + (contentsUnchanged ? "unchanged" : "changed"));
if (DEBUG) Slog.d(TAG, "order was " + (orderUnchanged ? "unchanged" : "changed"));
if (DEBUG) Slog.d(TAG, "notification is " + (isTopAnyway ? "top" : "not top"));
final boolean wasExpanded = oldEntry.userExpanded();
removeNotificationViews(key);
addNotificationViews(key, notification);
if (wasExpanded) {
final NotificationData.Entry newEntry = mNotificationData.findByKey(key);
expandView(newEntry, true);
}
}
// Update the veto button accordingly (and as a result, whether this row is