commit 1f3f544f21cab3728f749ab66cd6859e9dfcf389
author Selim Cinek <cinek@google.com> Fri Apr 10 17:54:46 2015 -0700
committer Selim Cinek <cinek@google.com> Wed Apr 15 12:58:39 2015 -0700
tree d2082ea2826bcbe4bb70a4579cce61418e350cee
parent d2281151ee18f5fd530bc062c59b3f77082317bf

Fixed more heads up bugs

Change-Id: Ibfb6656deb3bc588fc9292a672a5e4d4d1de4d23

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

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index b759684..fa1ec0f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -643,9 +643,10 @@
         }
         mMaxExpandHeight = expandedChild.getHeight();
         View headsUpChild = mPrivateLayout.getHeadsUpChild();
-        if (headsUpChild != null) {
-            mHeadsUpHeight = headsUpChild.getHeight();
+        if (headsUpChild == null) {
+            headsUpChild = mPrivateLayout.getContractedChild();
         }
+        mHeadsUpHeight = headsUpChild.getHeight();
         if (intrinsicBefore != getIntrinsicHeight()) {
             notifyHeightChanged(false  /* needsAnimation */);
         }