commit 2761ccd4799971b7ad696f6f94036ca16113c78d
author Chris Wren <cwren@android.com> Thu Jun 28 11:40:34 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 28 11:40:34 2012 -0700
tree 81aeb3816a933d39f94c506de44bd58d13297d62
parent 9a8a28aa72b9a4ebeaff3b30c497ce9bb5046083
parent 5ae1ea8400d576b90f0ef02b2f10201d74729be6

Merge "Retain expanded state across more than one violent update." into jb-dev

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 4f485a2..ec99513 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -913,6 +913,7 @@
             if (wasExpanded) {
                 final NotificationData.Entry newEntry = mNotificationData.findByKey(key);
                 expandView(newEntry, true);
+                newEntry.setUserExpanded(true);
             }
         }
 

packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
index 1a07ed3..dfd8cf8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
@@ -65,6 +65,12 @@
         public boolean userExpanded() {
             return NotificationData.getUserExpanded(row);
         }
+        /**
+         * Set the flag indicating that this was manually expanded by the user.
+         */
+        public boolean setUserExpanded(boolean userExpanded) {
+            return NotificationData.setUserExpanded(row, userExpanded);
+        }
     }
     private final ArrayList<Entry> mEntries = new ArrayList<Entry>();
     private final Comparator<Entry> mEntryCmp = new Comparator<Entry>() {