Rotating the Canvas impacts TouchEvents

I have a map application using an in-house map engine on Android. I'm workin开发者_如何学JAVAg on a rotating Map view that rotates the map based on the phone's orientation using the Sensor Service. All works fine with the exception of dragging the map when the phone is pointing other than North. For example, if the phone is facing West, dragging the Map up still moves the Map to the South versus East as would be expected. I'm assuming translating the canvas is one possible solution but I'm honestly not sure the correct way to do this.

Here is the code I'm using to rotate the Canvas:

public void dispatchDraw(Canvas canvas)
{
    canvas.save(Canvas.MATRIX_SAVE_FLAG);
    // mHeading is the orientation from the Sensor
    canvas.rotate(-mHeading, origin[X],origin[Y]);


    mCanvas.delegate = canvas;
    super.dispatchDraw(mCanvas);
    canvas.restore();
}

What is the best approach to make dragging the map consistent regardless of the phones orientation? The sensormanager has a "remapcoordinates()" method but it's not clear that this will resolve my problem.

---

You can trivially get the delta x and delta y between two consecutive move events. To correct these values for your canvas rotation you can use some simple trignometry:

void correctPointForRotate(PointF delta, float rotation) {

    // Get the angle of movement (0=up, 90=right, 180=down, 270=left)
    double a = Math.atan2(-delta.x,delta.y); 
    a = Math.toDegrees(a);  // a now ranges -180 to +180
    a += 180;

    // Adjust angle by amount the map is rotated around the center point
    a += rotation;
    a = Math.toRadians(a);

    // Calculate new corrected panning deltas
    double hyp = Math.sqrt(x*x + y*y);
    delta.x = (float)(hyp * Math.sin(a));
    delta.y = -(float)(hyp * Math.cos(a));
}