Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7981719 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

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

* commit '5c401a0e':
  Fixed a bug where the panel got into a wrong state
parents f1178b23 5c401a0e

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

+8 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -3754,7 +3754,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    }



    private void instantCollapseNotificationPanel() {

        mNotificationPanel.setExpandedFraction(0);

        mNotificationPanel.instantCollapse();

    }



    @Override