Merge "Fixed a memory leak with notification children" into nyc-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

@@ -1544,6 +1544,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             }
             for (int i = 0; i < toRemove.size(); i++) {
                 removeNotification(toRemove.get(i).getStatusBarNotification().getKey(), ranking);
+                // we need to ensure that the view is actually properly removed from the viewstate
+                // as this won't happen anymore when kept in the parent.
+                mStackScroller.removeViewStateForView(toRemove.get(i));
             }
         }
     }

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

@@ -3589,6 +3589,15 @@ public class NotificationStackScrollLayout extends ViewGroup
         setFadedOut(alpha != 1.0f);
     }
 
+    /**
+     * Remove the a given view from the viewstate. This is currently used when the children are
+     * kept in the parent artificially to have a nicer animation.
+     * @param view the view to remove
+     */
+    public void removeViewStateForView(View view) {
+        mCurrentStackScrollState.removeViewStateForView(view);
+    }
+
     /**
      * A listener that is notified when some child locations might have changed.
      */