Merge commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7' into gingerbread-plus-aosp

* commit '224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7':
  Fix public bug http://code.google.com/p/android/issues/detail?id=10067
This commit is contained in:
Adam Powell
2010-08-10 17:54:58 -07:00
committed by Android Git Automerger

View File

@@ -312,7 +312,7 @@ public class ScaleGestureDetector {
* MotionEvent has no getRawX(int) method; simulate it pending future API approval.
*/
private static float getRawX(MotionEvent event, int pointerIndex) {
float offset = event.getX() - event.getRawX();
float offset = event.getRawX() - event.getX();
return event.getX(pointerIndex) + offset;
}
@@ -320,7 +320,7 @@ public class ScaleGestureDetector {
* MotionEvent has no getRawY(int) method; simulate it pending future API approval.
*/
private static float getRawY(MotionEvent event, int pointerIndex) {
float offset = event.getY() - event.getRawY();
float offset = event.getRawY() - event.getY();
return event.getY(pointerIndex) + offset;
}