Merge "Fixed a bug when swiping out notifications when scrolled."

1 files changed, 9 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index e9d67c2..ed756aa 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -1449,7 +1449,7 @@ public class NotificationStackScrollLayout extends ViewGroup
      */
     private void updateScrollStateForRemovedChild(View removedChild) {
         int startingPosition = getPositionInLinearLayout(removedChild);
-        int childHeight = removedChild.getHeight() + mPaddingBetweenElements;
+        int childHeight = getIntrinsicHeight(removedChild) + mPaddingBetweenElements;
         int endPosition = startingPosition + childHeight;
         if (endPosition <= mOwnScrollY) {
             // This child is fully scrolled of the top, so we have to deduct its height from the
@@ -1462,6 +1462,14 @@ public class NotificationStackScrollLayout extends ViewGroup
         }
     }
 
+    private int getIntrinsicHeight(View view) {
+        if (view instanceof ExpandableView) {
+            ExpandableView expandableView = (ExpandableView) view;
+            return expandableView.getIntrinsicHeight();
+        }
+        return view.getHeight();
+    }
+
     private int getPositionInLinearLayout(View requestedChild) {
         int position = 0;
         for (int i = 0; i < getChildCount(); i++) {