Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed a crash with the autocancelling" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-23 19:21:56 +00:00
committed by Android (Google) Code Review
parent 18ef543102 53c4d3d23e
commit 4a4b76f6e8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
View File

@@ -215,17 +215,23 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged
public boolean isOnlyChildInSuppressedGroup(StatusBarNotification sbn) { public boolean isOnlyChildInSuppressedGroup(StatusBarNotification sbn) {
return isGroupSuppressed(sbn.getGroupKey()) return isGroupSuppressed(sbn.getGroupKey())
&& isOnlyChildInGroup(sbn); && isOnlyChild(sbn);
} }
public boolean isOnlyChildInGroup(StatusBarNotification sbn) { private boolean isOnlyChild(StatusBarNotification sbn) {
return !sbn.getNotification().isGroupSummary() return !sbn.getNotification().isGroupSummary()
&& getTotalNumberOfChildren(sbn) == 1; && getTotalNumberOfChildren(sbn) == 1;
} }
public boolean isOnlyChildInGroup(StatusBarNotification sbn) {
return isOnlyChild(sbn) && getLogicalGroupSummary(sbn) != null;
}
private int getTotalNumberOfChildren(StatusBarNotification sbn) { private int getTotalNumberOfChildren(StatusBarNotification sbn) {
return getNumberOfIsolatedChildren(sbn.getGroupKey()) int isolatedChildren = getNumberOfIsolatedChildren(sbn.getGroupKey());
+ mGroupMap.get(sbn.getGroupKey()).children.size(); NotificationGroup group = mGroupMap.get(sbn.getGroupKey());
int realChildren = group != null ? group.children.size() : 0;
return isolatedChildren + realChildren;
} }
private boolean isGroupSuppressed(String groupKey) { private boolean isGroupSuppressed(String groupKey) {