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

Commit 9429e6eb authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 92110af2: am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine... 

am 92110af2: am 5f0b1721: am 25bd8abc: Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2

* commit '92110af2':
  Fix swipe gesture cosine calculation. Bug: 4124987
parents 02318040 92110af2

services/input/InputReader.cpp

+5 −1
Original line number Diff line number Diff line
@@ -4185,7 +4185,11 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when, 
                        // approches 1.0.  Recall that dot(v1, v2) = cos(angle) * mag(v1) * mag(v2).

                        PointerGesture::Delta& delta1 = mPointerGesture.referenceDeltas[id1];

                        PointerGesture::Delta& delta2 = mPointerGesture.referenceDeltas[id2];

                        float dot = delta1.dx * delta2.dx + delta1.dy * delta2.dy;

                        float dx1 = delta1.dx * mLocked.pointerGestureXZoomScale;

                        float dy1 = delta1.dy * mLocked.pointerGestureYZoomScale;

                        float dx2 = delta2.dx * mLocked.pointerGestureXZoomScale;

                        float dy2 = delta2.dy * mLocked.pointerGestureYZoomScale;

                        float dot = dx1 * dx2 + dy1 * dy2;

                        float cosine = dot / (dist1 * dist2); // denominator always > 0

                        if (cosine >= mConfig->pointerGestureSwipeTransitionAngleCosine) {

                            // Pointers are moving in the same direction.  Switch to SWIPE.

services/input/InputReader.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ struct InputReaderConfiguration { 
            pointerGestureTapSlop(10.0f), // 10 pixels

            pointerGestureMultitouchSettleInterval(100 * 1000000LL), // 100 ms

            pointerGestureMultitouchMinDistance(15), // 15 pixels

            pointerGestureSwipeTransitionAngleCosine(0.5f), // cosine of 45degrees

            pointerGestureSwipeTransitionAngleCosine(0.2588f), // cosine of 75 degrees

            pointerGestureSwipeMaxWidthRatio(0.25f),

            pointerGestureMovementSpeedRatio(0.8f),

            pointerGestureZoomSpeedRatio(0.3f) { }