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

Commit fb98a502 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix weird state when tracking and pressing back 

Bug: 10934514
Change-Id: I60bbd6005e664033ed22c87b404ddc918e5f2c0e
parent be8df5ae

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

+1 −2
Original line number Diff line number Diff line
@@ -639,7 +639,6 @@ public abstract class PanelView extends FrameLayout { 
    }



    public void collapse() {

        // TODO: abort animation or ongoing touch

        if (DEBUG) logf("collapse: " + this);

        if (mPeekPending || mPeekAnimator != null) {

            mCollapseAfterPeek = true;
@@ -650,7 +649,7 @@ public abstract class PanelView extends FrameLayout { 
                removeCallbacks(mPeekRunnable);

                mPeekRunnable.run();

            }

        } else if (!isFullyCollapsed()) {

        } else if (!isFullyCollapsed() && !mTracking) {

            if (mHeightAnimator != null) {

                mHeightAnimator.cancel();

            }