am 89551fab: Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev
* commit '89551fab5725e7c67002f894bdf8933c00a9c409':
Fix blank QS Panel after double tap on profile icon
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 @@
};
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);