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

Commit 909cb49a authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix QS expansion weirdness #2" into lmp-dev

parents a0efbdf2 b7a3303f

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

+1 −0
Original line number Diff line number Diff line
@@ -740,6 +740,7 @@ public class NotificationPanelView extends PanelView implements 


    @Override

    public void flingTopOverscroll(float velocity, boolean open) {

        mLastOverscroll = 0f;

        setQsExpansion(mQsExpansionHeight);

        flingSettings(!mQsExpansionEnabled && open ? 0f : velocity, open && mQsExpansionEnabled,

                new Runnable() {

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

+4 −6
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ public abstract class PanelView extends FrameLayout { 
    private boolean mHasLayoutedSinceDown;

    private float mUpdateFlingVelocity;

    private boolean mUpdateFlingOnLayout;

    private boolean mTouching;

    private boolean mPeekTouching;

    private boolean mJustPeeked;

    private boolean mClosing;

    protected boolean mTracking;
@@ -233,7 +233,7 @@ public abstract class PanelView extends FrameLayout { 
                mPanelClosedOnDown = mExpandedHeight == 0.0f;

                mHasLayoutedSinceDown = false;

                mUpdateFlingOnLayout = false;

                mTouching = true;

                mPeekTouching = mPanelClosedOnDown;

                if (mVelocityTracker == null) {

                    initVelocityTracker();

                }
@@ -337,7 +337,7 @@ public abstract class PanelView extends FrameLayout { 
                    mVelocityTracker.recycle();

                    mVelocityTracker = null;

                }

                mTouching = false;

                mPeekTouching = false;

                break;

        }

        return !waitForTouchSlop || mTracking;
@@ -399,7 +399,6 @@ public abstract class PanelView extends FrameLayout { 
                mPanelClosedOnDown = mExpandedHeight == 0.0f;

                mHasLayoutedSinceDown = false;

                mUpdateFlingOnLayout = false;

                mTouching = true;

                initVelocityTracker();

                trackMovement(event);

                break;
@@ -434,7 +433,6 @@ public abstract class PanelView extends FrameLayout { 
                break;

            case MotionEvent.ACTION_CANCEL:

            case MotionEvent.ACTION_UP:

                mTouching = false;

                break;

        }

        return false;
@@ -571,7 +569,7 @@ public abstract class PanelView extends FrameLayout { 
                && currentMaxPanelHeight != mExpandedHeight

                && !mPeekPending

                && mPeekAnimator == null

                && !mTouching) {

                && !mPeekTouching) {

            setExpandedHeight(currentMaxPanelHeight);

        }

    }