Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f98d3e30 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am e8fa85d7: am 224ab9a5: Merge "Fix public bug... 

am e8fa85d7: am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread

Merge commit 'e8fa85d7'

* commit 'e8fa85d7':
  Fix public bug http://code.google.com/p/android/issues/detail?id=10067
parents ea5282cf e8fa85d7

core/java/android/view/ScaleGestureDetector.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }