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

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

Merge "Fixed a bug where QS could fling up even when collapsing" into nyc-dev 

am: 729166fb

* commit '729166fb':
  Fixed a bug where QS could fling up even when collapsing
parents 343b9150 729166fb

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

+5 −1
Original line number Diff line number Diff line
@@ -879,7 +879,11 @@ public class NotificationPanelView extends PanelView implements 
                mQsTracking = false;

                mTrackingPointer = -1;

                trackMovement(event);

                flingQsWithCurrentVelocity(y, event.getActionMasked() == MotionEvent.ACTION_CANCEL);

                float fraction = getQsExpansionFraction();

                if (fraction != 0f || y >= mInitialTouchY) {

                    flingQsWithCurrentVelocity(y,

                            event.getActionMasked() == MotionEvent.ACTION_CANCEL);

                }

                if (mVelocityTracker != null) {

                    mVelocityTracker.recycle();

                    mVelocityTracker = null;