From 98fa70c98f61fe1589b81deb260422b92d4c443a Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 29 Oct 2014 11:03:41 -0400 Subject: QS: Only hide grid if there is detail to show If the animation ends at the 'same' time as handleShowDetail is running it is possible for the grid content to get cleared by the animation callback just after it is shown in handleShowDetail. This checks mDetailRecord to avoid that chance. Bug: 18009138 Change-Id: Ia2951f44b5a1470321bf6580daf33917bbcb1ffd --- packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') 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 @@ 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); + } } }; -- cgit v1.1