commit 90b6a276bf9da4c91891fdb452fe5cda0ec716e2
author Selim Cinek <cinek@google.com> Fri Jun 03 16:50:52 2016 -0700
committer Selim Cinek <cinek@google.com> Mon Jun 06 17:20:33 2016 +0000
tree 4a5502ab205eadceed7e1138965c64e11af97aa7
parent 38d429f4395b3bac933ad8a77ab224659f9bb2e5

Fixed a flicker when closing QS without notifications

Change-Id: I0ca13626a676d0adf427d95edd76dd1bd2228fdc
Fixes: 28008271

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

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 f67e285..6fd12914 100644
--- 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 @@
         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);
         }