diff options
| author | Jason Monk <jmonk@google.com> | 2014-09-10 15:00:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-10 15:01:00 +0000 |
| commit | bd2ffe8f770ca5a62847d609f7cf07f0faf5f2bc (patch) | |
| tree | 399f93c438f415db096d1adb6f73ce49ebd6e80e /packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | |
| parent | 0875a782ad6688407050592dd32169d7a8f0716a (diff) | |
| parent | 8a2d4fc5be174fb200c788659d0a422564ae6f97 (diff) | |
| download | frameworks_base-bd2ffe8f770ca5a62847d609f7cf07f0faf5f2bc.zip frameworks_base-bd2ffe8f770ca5a62847d609f7cf07f0faf5f2bc.tar.gz frameworks_base-bd2ffe8f770ca5a62847d609f7cf07f0faf5f2bc.tar.bz2 | |
Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs/QSPanel.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 6117b98..2fafb2c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -532,6 +532,12 @@ public class QSPanel extends ViewGroup { }; private final AnimatorListenerAdapter mHideGridContentWhenDone = new AnimatorListenerAdapter() { + public void onAnimationCancel(Animator animation) { + // If we have been cancelled, remove the listener so that onAnimationEnd doesn't get + // called, this will avoid accidentally turning off the grid when we don't want to. + animation.removeListener(this); + }; + @Override public void onAnimationEnd(Animator animation) { setGridContentVisibility(false); |