Fixed a flicker when closing QS without notifications

Change-Id: I0ca13626a676d0adf427d95edd76dd1bd2228fdc Fixes: 28008271
2016-06-03 16:50:52 -07:00
parent 38d429f439
commit 90b6a276bf
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -2084,7 +2084,9 @@ public class NotificationStackScrollLayout extends ViewGroup
        final ExpandableView firstChild = getFirstChildNotGone();
        int firstChildMinHeight = firstChild != null
                ? firstChild.getIntrinsicHeight()
-                : mCollapsedSize;
+                : mEmptyShadeView != null
+                        ? mEmptyShadeView.getMinHeight()
+                        : mCollapsedSize;
        if (mOwnScrollY > 0) {
            firstChildMinHeight = Math.max(firstChildMinHeight - mOwnScrollY, mCollapsedSize);
        }