Merge "Don't let two closing animations run at the same time" into lmp-dev

2014-09-10 15:48:44 +00:00
parent ef88f708f9 98139559af
commit 6658b159db
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -684,7 +684,7 @@ public abstract class PanelView extends FrameLayout {
                removeCallbacks(mPeekRunnable);
                mPeekRunnable.run();
            }
-        } else if (!isFullyCollapsed() && !mTracking) {
+        } else if (!isFullyCollapsed() && !mTracking && !mClosing) {
            if (mHeightAnimator != null) {
                mHeightAnimator.cancel();
            }