Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev am: 2fba229166 am: 48eb3702fe

am: 056712327a

* commit '056712327a6daa3475477738a77611056314719d':
  Fixed a bug where a notification could be stuck in the overlay

Change-Id: I89cebb051980d729a2eb9f4e49a93055959bfd07

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

@@ -1891,10 +1891,13 @@ public abstract class BaseStatusBar extends SystemUI implements
                 public boolean onDismiss() {
                     if (mHeadsUpManager != null && mHeadsUpManager.isHeadsUp(notificationKey)) {
                         // 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
                         // become canceled shortly by NoMan, but we can't assume that.
-                        HeadsUpManager.setIsClickedNotification(row, true);
                         mHeadsUpManager.releaseImmediately(notificationKey);
                     }
                     StatusBarNotification parentToCancel = null;