From 95ed59283bd25fb363d13c000a7408bcafb5e93e Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Thu, 28 Aug 2014 14:30:12 +0200
Subject: [PATCH] Fixed a bug where notifications could remain in the overlay.

This led to notifications being visible even though they should
have been removed

Bug: 17295716
Change-Id: I05a243d5c9ca359d1f5ca29a7535935d6e61a4d6
---
 .../android/systemui/statusbar/ActivatableNotificationView.java | 2 ++
 .../android/systemui/statusbar/stack/StackStateAnimator.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
index fef4a398ecc9b..500bf45602d64 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java
@@ -461,6 +461,8 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView
         if (mDrawingAppearAnimation) {
             startAppearAnimation(false /* isAppearing */, translationDirection,
                     0, duration, onFinishedRunnable);
+        } else if (onFinishedRunnable != null) {
+            onFinishedRunnable.run();
         }
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
index afd7216b8b437..cd3c1a046040c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java
@@ -747,6 +747,7 @@ public class StackStateAnimator {
             } else if (event.animationType ==
                     NotificationStackScrollLayout.AnimationEvent.ANIMATION_TYPE_REMOVE) {
                 if (changingView.getVisibility() == View.GONE) {
+                    mHostLayout.getOverlay().remove(changingView);
                     continue;
                 }