Fixed a bug where a notification could not be collapsed

Also fixed a bug where the content height was wrongly
calculated when the dismissview was invisible.
Finally refined the appearance when more then 2 huns
are present.
Change-Id: If66243beef2383f2cb36961deffcb0a42bbcd177
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
index 54ed04c..d98bcfe 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollAlgorithm.java
@@ -524,8 +524,8 @@
                     // Ensure that a headsUp is never below the topmost headsUp
                     StackViewState topState = resultState.getViewStateForView(topHeadsUpEntry);
                     childState.height = row.getHeadsUpHeight();
-                    childState.yTranslation = Math.min(childState.yTranslation,
-                            topState.yTranslation + topState.height - childState.height);
+                    childState.yTranslation = topState.yTranslation + topState.height
+                            - childState.height;
                 }
             } else if (mIsExpanded) {
                 if (isTopEntry) {