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

* commit '5d80f19c145f99eb1a2ada57a6fb1d8c3a6fa8b2': QS: Only hide grid if there is detail to show
2014-10-29 22:50:22 +00:00
parent 5cf65f7bf6 5d80f19c14
commit 736695dc3e
1 changed files with 4 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/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);
+            }
        }
    };