summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-08-10 17:50:11 -0700
committerAdam Powell <adamp@google.com>2010-08-10 17:50:11 -0700
commit9bccdb7d5c93e350337e707bc6edf3cd017b8f96 (patch)
tree398f3388ef6ecca5440edd6ba88dd92c6bed6f2f /core/java/android
parentc3fc2d03d58a258c53c9265a70143d4af076b764 (diff)
downloadframeworks_base-9bccdb7d5c93e350337e707bc6edf3cd017b8f96.zip
frameworks_base-9bccdb7d5c93e350337e707bc6edf3cd017b8f96.tar.gz
frameworks_base-9bccdb7d5c93e350337e707bc6edf3cd017b8f96.tar.bz2
Fix public bug http://code.google.com/p/android/issues/detail?id=10067
Change-Id: I7b7a9a32e82fc7541beabe286b20b01f39406cc8
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/ScaleGestureDetector.java4
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;
}