drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chris Wren
2012-06-28 11:40:34 -07:00
committed by Android (Google) Code Review
parent 9a8a28aa72 5ae1ea8400
commit 2761ccd479
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@ -913,6 +913,7 @@ public abstract class BaseStatusBar extends SystemUI implements
if (wasExpanded) { if (wasExpanded) {
final NotificationData.Entry newEntry = mNotificationData.findByKey(key); final NotificationData.Entry newEntry = mNotificationData.findByKey(key);
expandView(newEntry, true); expandView(newEntry, true);
newEntry.setUserExpanded(true);
} }
} }

6
packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java
View File

@ -65,6 +65,12 @@ public class NotificationData {
public boolean userExpanded() { public boolean userExpanded() {
return NotificationData.getUserExpanded(row); 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 ArrayList<Entry> mEntries = new ArrayList<Entry>();
private final Comparator<Entry> mEntryCmp = new Comparator<Entry>() { private final Comparator<Entry> mEntryCmp = new Comparator<Entry>() {