diff options
| author | Jason Monk <jmonk@google.com> | 2014-10-29 11:03:41 -0400 |
|---|---|---|
| committer | Jason Monk <jmonk@google.com> | 2014-10-29 11:03:41 -0400 |
| commit | 98fa70c98f61fe1589b81deb260422b92d4c443a (patch) | |
| tree | 1057d3cd8a55b5878289ee4913fa43b81398da7d /packages | |
| parent | a9a550dd8e87b33979670cf856838ba227500547 (diff) | |
| download | frameworks_base-98fa70c98f61fe1589b81deb260422b92d4c443a.zip frameworks_base-98fa70c98f61fe1589b81deb260422b92d4c443a.tar.gz frameworks_base-98fa70c98f61fe1589b81deb260422b92d4c443a.tar.bz2 | |
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
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | 5 |
1 files changed, 4 insertions, 1 deletions
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); + } } }; |