From ca7b18e43f8159637ce0f5c80405a6a50fe2eacb Mon Sep 17 00:00:00 2001
From: Joseba Garc?a Etxebarria <joseba.gar@gmail.com>
Date: Tue, 24 Mar 2015 21:02:28 +0100
Subject: [PATCH] * More Android patch work

---
 android-project/src/org/libsdl/app/SDLActivity.java | 2 +-
 src/core/android/SDL_android.c                      | 8 --------
 src/video/android/SDL_androidmouse.c                | 4 ++--
 src/video/android/SDL_androidtouch.c                | 9 ++++-----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java
index 71280d1b332d0..993c98e4cc7cd 100644
--- a/android-project/src/org/libsdl/app/SDLActivity.java
+++ b/android-project/src/org/libsdl/app/SDLActivity.java
@@ -950,7 +950,7 @@ public SDLSurface(Context context) {
         mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
         
         if(Build.VERSION.SDK_INT >= 12) {
-            setOnGenericMotionListener(new SDLGenericMotionListener_API12());
+            setOnGenericMotionListener(new SDLGenericMotionListener());
         }
 
         // Some arbitrary defaults to avoid a potential division by zero
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
index 8e3d8739110a3..f7238a919eb0e 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -302,14 +302,6 @@ JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeMouse(
     Android_OnMouse(button, action, x, y);
 }
 
-/* Mouse */
-JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeMouse(
-                                    JNIEnv* env, jclass jcls,
-                                    jint button, jint action, jfloat x, jfloat y)
-{
-    Android_OnMouse(button, action, x, y);
-}
-
 /* Accelerometer */
 JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeAccel(
                                     JNIEnv* env, jclass jcls,
diff --git a/src/video/android/SDL_androidmouse.c b/src/video/android/SDL_androidmouse.c
index 35bc675551f8a..12263fd12c0ad 100644
--- a/src/video/android/SDL_androidmouse.c
+++ b/src/video/android/SDL_androidmouse.c
@@ -24,7 +24,7 @@
 #if SDL_VIDEO_DRIVER_ANDROID
 
 #include "SDL_androidmouse.h"
-#include "SDL_Log.h"
+#include "SDL_log.h"
 
 #include "SDL_events.h"
 #include "../../events/SDL_mouse_c.h"
@@ -71,7 +71,7 @@ void Android_OnMouse( int androidButton, int action, float x, float y) {
             break;
 
         case ACTION_SCROLL:
-            SDL_SendMouseWheel(Android_Window, 0, x, y);
+            SDL_SendMouseWheel(Android_Window, 0, x, y, SDL_MOUSEWHEEL_NORMAL);
             break;
 
         default:
diff --git a/src/video/android/SDL_androidtouch.c b/src/video/android/SDL_androidtouch.c
index 4a9266e3fb84f..1ad78dd1b92c6 100644
--- a/src/video/android/SDL_androidtouch.c
+++ b/src/video/android/SDL_androidtouch.c
@@ -24,13 +24,12 @@
 
 #include <android/log.h>
 
+#include "SDL_hints.h"
 #include "SDL_events.h"
-#include "../../events/SDL_mouse_c.h"
-#include "../../events/SDL_touch_c.h"
 #include "SDL_log.h"
-
 #include "SDL_androidtouch.h"
-
+#include "../../events/SDL_mouse_c.h"
+#include "../../events/SDL_touch_c.h"
 #include "../../core/android/SDL_android.h"
 
 #define ACTION_DOWN 0
@@ -69,7 +68,7 @@ void Android_OnTouch(int touch_device_id_in, int pointer_finger_id_in, int actio
     SDL_TouchID touchDeviceId = 0;
     SDL_FingerID fingerId = 0;
     int window_x, window_y;
-    char * hint;
+    const char * hint;
     static SDL_FingerID pointerFingerID = 0;
 
     if (!Android_Window) {