Merge "Fixed a bug with the number of notifications visible on lockscreen" into nyc-dev am: 91628f6
am: f8ff03d
* commit 'f8ff03de77e2df395795a0b29878df81d5cd77e1':
Fixed a bug with the number of notifications visible on lockscreen
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 560dbac..d9a0f43 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -202,6 +202,7 @@
notifyBarPanelExpansionChanged();
}
};
+ private NotificationGroupManager mGroupManager;
public NotificationPanelView(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -415,6 +416,11 @@
if (!(child instanceof ExpandableNotificationRow)) {
continue;
}
+ boolean suppressedSummary = mGroupManager.isSummaryOfSuppressedGroup(
+ ((ExpandableNotificationRow) child).getStatusBarNotification());
+ if (suppressedSummary) {
+ continue;
+ }
availableSpace -= child.getMinHeight() + notificationPadding;
if (availableSpace >= 0 && count < maximum) {
count++;
@@ -2298,4 +2304,8 @@
List<ActivityManager.RunningTaskInfo> tasks = am.getRunningTasks(1);
return !tasks.isEmpty() && pkgName.equals(tasks.get(0).topActivity.getPackageName());
}
+
+ public void setGroupManager(NotificationGroupManager groupManager) {
+ mGroupManager = groupManager;
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 86031e1..9b1f338 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -708,6 +708,7 @@
mNotificationPanel = (NotificationPanelView) mStatusBarWindow.findViewById(
R.id.notification_panel);
mNotificationPanel.setStatusBar(this);
+ mNotificationPanel.setGroupManager(mGroupManager);
mStatusBarView = (PhoneStatusBarView) mStatusBarWindow.findViewById(R.id.status_bar);
mStatusBarView.setBar(this);
