diff options
author | Adam Powell <adamp@google.com> | 2010-08-10 17:52:15 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-10 17:52:15 -0700 |
commit | 224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7 (patch) | |
tree | 22693e7451b6a3a8dd96c10469ccf85d313c2aaa | |
parent | f39d5987b977fdff8c34a2ddabaec31d1e909db3 (diff) | |
parent | 9bccdb7d5c93e350337e707bc6edf3cd017b8f96 (diff) | |
download | frameworks_base-224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7.zip frameworks_base-224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7.tar.gz frameworks_base-224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7.tar.bz2 |
Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread
-rw-r--r-- | core/java/android/view/ScaleGestureDetector.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java index ff34f4a..0999598 100644 --- a/core/java/android/view/ScaleGestureDetector.java +++ b/core/java/android/view/ScaleGestureDetector.java @@ -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; } |