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

Fixed a bug where the summary could become visible even if it was suppressed am: 80c44dd800

Browse Source 
am: b665b73437

Change-Id: If10fcd405843f8e84e1512970b58186af5965948
This commit is contained in:
Selim Cinek
2016-08-17 18:18:48 +00:00
committed by android-build-merger
parent decebdad19 b665b73437
commit 4a7e6cfe3f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged
private int mBarState = -1;
private HashMap<String, StatusBarNotification> mIsolatedEntries = new HashMap<>();
private HeadsUpManager mHeadsUpManager;
private boolean mUpdatingSuppressionBlocked;
private boolean mIsUpdatingUnchangedGroup;
public void setOnGroupChangeListener(OnGroupChangeListener listener) {
mListener = listener;
@@ -141,7 +141,7 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged
}
private void updateSuppression(NotificationGroup group) {
if (group == null || mUpdatingSuppressionBlocked) {
if (group == null) {
return;
}
boolean prevSuppressed = group.suppressed;
@@ -154,7 +154,9 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged
if (group.suppressed) {
handleSuppressedSummaryHeadsUpped(group.summary);
}
mListener.onGroupsChanged();
if (!mIsUpdatingUnchangedGroup) {
mListener.onGroupsChanged();
}
}
}
@@ -188,12 +190,12 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged
boolean groupKeysChanged = !oldKey.equals(newKey);
boolean wasGroupChild = isGroupChild(oldNotification);
boolean isGroupChild = isGroupChild(entry.notification);
mUpdatingSuppressionBlocked = !groupKeysChanged && wasGroupChild == isGroupChild;
mIsUpdatingUnchangedGroup = !groupKeysChanged && wasGroupChild == isGroupChild;
if (mGroupMap.get(getGroupKey(oldNotification)) != null) {
onEntryRemovedInternal(entry, oldNotification);
}
onEntryAdded(entry);
mUpdatingSuppressionBlocked = false;
mIsUpdatingUnchangedGroup = false;
if (isIsolated(entry.notification)) {
mIsolatedEntries.put(entry.key, entry.notification);
if (groupKeysChanged) {