Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix swipe gesture cosine calculation. Bug: 4124987" into honeycomb-mr2

Browse Source
This commit is contained in:
Jeff Brown
2011-06-07 16:58:06 -07:00
committed by Android (Google) Code Review
parent 68b8143496 6674d9bf0a
commit 25bd8abce9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/input/InputReader.cpp
View File

@@ -3940,7 +3940,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.

2
services/input/InputReader.h
View File

@@ -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) { }