summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Wren <cwren@android.com> 2012-06-28 04:30:48 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-06-28 04:30:48 -0700
commit8930458639527448429362255af96e94f5aba5ed (patch)
tree33fc9de8960998d5b5bb16558670f3d6d3c8fe2b
parent6c2ecbd5e3e7bcbd84be94704ec904f8c29ebd37 (diff)
parentc9433ecb51772cc41394cbb1a05e8e25a382dbeb (diff)
Merge "Retain expanded state across violent updates." into jb-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 0866d181b4a6..4f485a288111 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -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