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

Commit c89d516e authored by Winson's avatar Winson
Browse files

Fixing merge conflict from DR to master. 

Change-Id: Id76602204dffa2745534e8290a14e407de639c0b
parent b0894915

packages/SystemUI/src/com/android/systemui/recents/views/TaskStackViewTouchHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback { 
                mActivePointerId = ev.getPointerId(index);

                mLastMotionX = (int) ev.getX(index);

                mLastMotionY = (int) ev.getY(index);

                mLastP = mSv.mLayoutAlgorithm.screenYToCurveProgress(mLastMotionY);

                mLastP = layoutAlgorithm.sCurve.xToP(mLastMotionY, layoutAlgorithm.mStackRect);

                break;

            }

            case MotionEvent.ACTION_MOVE: {
@@ -199,7 +199,7 @@ class TaskStackViewTouchHandler implements SwipeHelper.Callback { 
                    mActivePointerId = ev.getPointerId(newPointerIndex);

                    mLastMotionX = (int) ev.getX(newPointerIndex);

                    mLastMotionY = (int) ev.getY(newPointerIndex);

                    mLastP = mSv.mLayoutAlgorithm.screenYToCurveProgress(mLastMotionY);

                    mLastP = layoutAlgorithm.sCurve.xToP(mLastMotionY, layoutAlgorithm.mStackRect);

                    mVelocityTracker.clear();

                }

                break;