From 6bb4a9b356bdb141e353a8115e100029bed3eb88 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Thu, 9 Oct 2014 17:48:05 -0700
Subject: [PATCH] Fixed a bug where the panel got into a wrong state

Bug: 17939708
Change-Id: Ieaa9dc2fc0c92ce52b02ac4ea452df47ee492ac3
---
 .../com/android/systemui/statusbar/phone/PanelView.java   | 8 ++++++++
 .../android/systemui/statusbar/phone/PhoneStatusBar.java  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index c612e4c408c80..d8c99f83ec286 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -774,6 +774,14 @@ public abstract class PanelView extends FrameLayout {
         requestLayout();
     }
 
+    public void instantCollapse() {
+        abortAnimations();
+        setExpandedFraction(0f);
+        if (mExpanding) {
+            notifyExpandingFinished();
+        }
+    }
+
     private void abortAnimations() {
         cancelPeek();
         if (mHeightAnimator != null) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index d0f73b166facc..a55ce1588680e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -3733,7 +3733,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
     }
 
     private void instantCollapseNotificationPanel() {
-        mNotificationPanel.setExpandedFraction(0);
+        mNotificationPanel.instantCollapse();
     }
 
     @Override