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

Commit 127c4439 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a bug where the panel could be stuck" into oc-dev am: e8dceabd 

am: 3a18b28a

Change-Id: I129f1939631a38b2aa51659e9ff4207404416398
parents 9a95f99f 3a18b28a

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

+5 −2
Original line number Diff line number Diff line
@@ -304,10 +304,10 @@ public abstract class PanelView extends FrameLayout { 
                trackMovement(event);

                if (!mGestureWaitForTouchSlop || (mHeightAnimator != null && !mHintAnimationRunning)

                        || mPeekAnimator != null) {

                    cancelHeightAnimator();

                    cancelPeek();

                    mTouchSlopExceeded = (mHeightAnimator != null && !mHintAnimationRunning)

                            || mPeekAnimator != null;

                    cancelHeightAnimator();

                    cancelPeek();

                    onTrackingStarted();

                }

                if (isFullyCollapsed() && !mHeadsUpManager.hasPinnedHeadsUp()) {
@@ -612,6 +612,9 @@ public abstract class PanelView extends FrameLayout { 


    protected void cancelHeightAnimator() {

        if (mHeightAnimator != null) {

            if (mHeightAnimator.isRunning()) {

                mPanelUpdateWhenAnimatorEnds = false;

            }

            mHeightAnimator.cancel();

        }

        endClosing();