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

automerge: 736695d

* commit '736695dc3ef2abb5fdb66c0e026e84fdc68a245f':
  QS: Only hide grid if there is detail to show

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

@@ -542,7 +542,10 @@ public class QSPanel extends ViewGroup {
 
         @Override
         public void onAnimationEnd(Animator animation) {
-            setGridContentVisibility(false);
+            // Only hide content if still in detail state.
+            if (mDetailRecord != null) {
+                setGridContentVisibility(false);
+            }
         }
     };