commit 5d80f19c145f99eb1a2ada57a6fb1d8c3a6fa8b2
author Jason Monk <jmonk@google.com> Wed Oct 29 15:38:57 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 29 15:38:58 2014 +0000
tree 6d05b1842ba6d76f0593dce4d266b773ea64711d
parent 8cfb3f1e4dc76c4fa92e889991f0e9dd37823d1b
parent 98fa70c98f61fe1589b81deb260422b92d4c443a

Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev

packages/SystemUI/src/com/android/systemui/qs/QSPanel.java

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
index fdebdd3..54a8414 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
@@ -542,7 +542,10 @@
 
         @Override
         public void onAnimationEnd(Animator animation) {
-            setGridContentVisibility(false);
+            // Only hide content if still in detail state.
+            if (mDetailRecord != null) {
+                setGridContentVisibility(false);
+            }
         }
     };