Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev

This commit is contained in:
Selim Cinek
2016-05-27 20:47:06 +00:00
committed by Android (Google) Code Review

View File

@@ -1887,10 +1887,13 @@ public abstract class BaseStatusBar extends SystemUI implements
public boolean onDismiss() { public boolean onDismiss() {
if (mHeadsUpManager != null && mHeadsUpManager.isHeadsUp(notificationKey)) { if (mHeadsUpManager != null && mHeadsUpManager.isHeadsUp(notificationKey)) {
// Release the HUN notification to the shade. // Release the HUN notification to the shade.
if (isPanelFullyCollapsed()) {
HeadsUpManager.setIsClickedNotification(row, true);
}
// //
// In most cases, when FLAG_AUTO_CANCEL is set, the notification will // In most cases, when FLAG_AUTO_CANCEL is set, the notification will
// become canceled shortly by NoMan, but we can't assume that. // become canceled shortly by NoMan, but we can't assume that.
HeadsUpManager.setIsClickedNotification(row, true);
mHeadsUpManager.releaseImmediately(notificationKey); mHeadsUpManager.releaseImmediately(notificationKey);
} }
StatusBarNotification parentToCancel = null; StatusBarNotification parentToCancel = null;