am 5c401a0e: am 3e683b6a: Merge "Fixed a bug where the panel got into a wrong state" into lmp-dev

* commit '5c401a0e0bf3b5f647f7f1791e10195f748bfe96':
  Fixed a bug where the panel got into a wrong state

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) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

@@ -3754,7 +3754,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
     }
 
     private void instantCollapseNotificationPanel() {
-        mNotificationPanel.setExpandedFraction(0);
+        mNotificationPanel.instantCollapse();
     }
 
     @Override