From 4e5fb6c0c8e07fdeb38cfba57390230f7dd682d0 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Fri, 3 Aug 2012 23:59:05 -0400 Subject: [PATCH] Make Android port compatible with older API versions again. Fixes Bugzilla #1563. Thanks to Philipp Wiesemann for the patch! --- android-project/src/org/libsdl/app/SDLActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java index b0b472ceb..1cc17a9f7 100644 --- a/android-project/src/org/libsdl/app/SDLActivity.java +++ b/android-project/src/org/libsdl/app/SDLActivity.java @@ -539,9 +539,9 @@ public boolean onTouch(View v, MotionEvent event) { final int touchDevId = event.getDeviceId(); final int pointerCount = event.getPointerCount(); // touchId, pointerId, action, x, y, pressure - int actionPointerIndex = event.getActionIndex(); + int actionPointerIndex = (event.getAction() & MotionEvent.ACTION_POINTER_ID_MASK) >> MotionEvent. ACTION_POINTER_ID_SHIFT; /* API 8: event.getActionIndex(); */ int pointerFingerId = event.getPointerId(actionPointerIndex); - int action = event.getActionMasked(); + int action = (event.getAction() & MotionEvent.ACTION_MASK); /* API 8: event.getActionMasked(); */ float x = event.getX(actionPointerIndex); float y = event.getY(actionPointerIndex);