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

Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev

Browse Source
This commit is contained in:
Adam Powell
2012-09-26 17:20:36 -07:00
committed by Android (Google) Code Review
parent ead9054f4e abde042a82
commit 5a864aa0d8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/ScaleGestureDetector.java
View File

@@ -314,7 +314,7 @@ public class ScaleGestureDetector {
}
}
final boolean configChanged =
final boolean configChanged = action == MotionEvent.ACTION_DOWN ||
action == MotionEvent.ACTION_POINTER_UP ||
action == MotionEvent.ACTION_POINTER_DOWN;
final boolean pointerUp = action == MotionEvent.ACTION_POINTER_UP;
@@ -344,7 +344,7 @@ public class ScaleGestureDetector {
if (skipIndex == i) continue;
// Average touch major and touch minor and convert the resulting diameter into a radius.
final float touchSize = getAdjustedTouchHistory(event.getPointerId(i));
final float touchSize = getAdjustedTouchHistory(event.getPointerId(i)) / 2;
devSumX += Math.abs(event.getX(i) - focusX) + touchSize;
devSumY += Math.abs(event.getY(i) - focusY) + touchSize;
}