diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java
index 4a083e9d7..b9348e8ed 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNIActivity.java
@@ -232,8 +232,57 @@ public class GL2JNIActivity extends Activity {
         }
     }
 
+    private void processJoystickInput(MotionEvent event, Integer playerNum) {
+        // Joystick
+        if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+            // do other things with joystick
+            float LS_X = event.getAxisValue(OuyaController.AXIS_LS_X);
+            float LS_Y = event.getAxisValue(OuyaController.AXIS_LS_Y);
+            float RS_X = event.getAxisValue(OuyaController.AXIS_RS_X);
+            float RS_Y = event.getAxisValue(OuyaController.AXIS_RS_Y);
+            float L2 = event.getAxisValue(OuyaController.AXIS_L2);
+            float R2 = event.getAxisValue(OuyaController.AXIS_R2);
+
+            if (!pad.joystick[playerNum]) {
+                pad.previousLS_X[playerNum] = pad.globalLS_X[playerNum];
+                pad.previousLS_Y[playerNum] = pad.globalLS_Y[playerNum];
+                pad.globalLS_X[playerNum] = LS_X;
+                pad.globalLS_Y[playerNum] = LS_Y;
+            }
+
+            GL2JNIView.jx[playerNum] = (int) (LS_X * 126);
+            GL2JNIView.jy[playerNum] = (int) (LS_Y * 126);
+
+            GL2JNIView.lt[playerNum] = (int) (L2 * 255);
+            GL2JNIView.rt[playerNum] = (int) (R2 * 255);
+
+            if (prefs.getBoolean(Gamepad.pref_js_rbuttons + pad.portId[playerNum], true)) {
+                if (RS_Y > 0.25) {
+                    handle_key(playerNum, pad.map[playerNum][0]/* A */, true);
+                    pad.wasKeyStick[playerNum] = true;
+                } else if (RS_Y < 0.25) {
+                    handle_key(playerNum, pad.map[playerNum][1]/* B */, true);
+                    pad.wasKeyStick[playerNum] = true;
+                } else if (pad.wasKeyStick[playerNum]){
+                    handle_key(playerNum, pad.map[playerNum][0], false);
+                    handle_key(playerNum, pad.map[playerNum][1], false);
+                    pad.wasKeyStick[playerNum] = false;
+                }
+            } else {
+                if (RS_Y > 0.25) {
+                    GL2JNIView.rt[playerNum] = (int) (RS_Y * 255);
+                    GL2JNIView.lt[playerNum] = (int) (L2 * 255);
+                } else if (RS_Y < 0.25) {
+                    GL2JNIView.rt[playerNum] = (int) (R2 * 255);
+                    GL2JNIView.lt[playerNum] = (int) (-(RS_Y) * 255);
+                }
+            }
+        }
+    }
+
     @Override
     public boolean onGenericMotionEvent(MotionEvent event) {
+
         Integer playerNum = Arrays.asList(pad.name).indexOf(event.getDeviceId());
         if (playerNum == -1) {
             playerNum = pad.deviceDescriptor_PlayerNum
@@ -246,59 +295,16 @@ public class GL2JNIActivity extends Activity {
             return false;
 
         if (!pad.compat[playerNum]) {
-
-            // Joystick
-            if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
-
-                // do other things with joystick
-                float LS_X = event.getAxisValue(OuyaController.AXIS_LS_X);
-                float LS_Y = event.getAxisValue(OuyaController.AXIS_LS_Y);
-                float RS_X = event.getAxisValue(OuyaController.AXIS_RS_X);
-                float RS_Y = event.getAxisValue(OuyaController.AXIS_RS_Y);
-                float L2 = event.getAxisValue(OuyaController.AXIS_L2);
-                float R2 = event.getAxisValue(OuyaController.AXIS_R2);
-
-                if (!pad.joystick[playerNum]) {
-                    pad.previousLS_X[playerNum] = pad.globalLS_X[playerNum];
-                    pad.previousLS_Y[playerNum] = pad.globalLS_Y[playerNum];
-                    pad.globalLS_X[playerNum] = LS_X;
-                    pad.globalLS_Y[playerNum] = LS_Y;
-                }
-
-                GL2JNIView.jx[playerNum] = (int) (LS_X * 126);
-                GL2JNIView.jy[playerNum] = (int) (LS_Y * 126);
-
-                GL2JNIView.lt[playerNum] = (int) (L2 * 255);
-                GL2JNIView.rt[playerNum] = (int) (R2 * 255);
-
-                if (prefs.getBoolean(Gamepad.pref_js_rbuttons + pad.portId[playerNum], true)) {
-                    if (RS_Y > 0.25) {
-                        handle_key(playerNum, pad.map[playerNum][0]/* A */, true);
-                        pad.wasKeyStick[playerNum] = true;
-                    } else if (RS_Y < 0.25) {
-                        handle_key(playerNum, pad.map[playerNum][1]/* B */, true);
-                        pad.wasKeyStick[playerNum] = true;
-                    } else if (pad.wasKeyStick[playerNum]){
-                        handle_key(playerNum, pad.map[playerNum][0], false);
-                        handle_key(playerNum, pad.map[playerNum][1], false);
-                        pad.wasKeyStick[playerNum] = false;
-                    }
-                } else {
-                    if (RS_Y > 0.25) {
-                        GL2JNIView.rt[playerNum] = (int) (RS_Y * 255);
-                        GL2JNIView.lt[playerNum] = (int) (L2 * 255);
-                    } else if (RS_Y < 0.25) {
-                        GL2JNIView.rt[playerNum] = (int) (R2 * 255);
-                        GL2JNIView.lt[playerNum] = (int) (-(RS_Y) * 255);
-                    }
-                }
+            final int historySize = event.getHistorySize();
+            for (int i = 0; i < historySize; i++) {
+                processJoystickInput(event, i);
             }
-
+            processJoystickInput(event, -1);
         }
+
         mView.pushInput();
-        // Only handle Left Stick on an Xbox 360 controller if there was
-        // some actual motion on the stick,
-        // so otherwise the event can be handled as a DPAD event
+        // Only handle Left Stick on an Xbox 360 controller if there was actual
+        // motion on the stick, otherwise event can be handled as a DPAD event
         return (pad.joystick[playerNum] || (!(pad.globalLS_X[playerNum] == pad.previousLS_X[playerNum])
                 || !(pad.globalLS_Y[playerNum] == pad.previousLS_Y[playerNum])))
                 && (!(pad.previousLS_X[playerNum] == 0.0f) || !(pad.previousLS_Y[playerNum] == 0.0f));
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java
index 923b96ac7..0223ccd96 100644
--- a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java
+++ b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/GL2JNINative.java
@@ -353,6 +353,54 @@ public class GL2JNINative extends NativeActivity {
 				&& (!(pad.previousLS_X[playerNum] == 0.0f) || !(pad.previousLS_Y[playerNum] == 0.0f));
 	}
 
+	private void processJoystickInput(MotionEvent event, Integer playerNum) {
+		// Joystick
+		if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+			// do other things with joystick
+			float LS_X = event.getAxisValue(OuyaController.AXIS_LS_X);
+			float LS_Y = event.getAxisValue(OuyaController.AXIS_LS_Y);
+			float RS_X = event.getAxisValue(OuyaController.AXIS_RS_X);
+			float RS_Y = event.getAxisValue(OuyaController.AXIS_RS_Y);
+			float L2 = event.getAxisValue(OuyaController.AXIS_L2);
+			float R2 = event.getAxisValue(OuyaController.AXIS_R2);
+
+			if (!pad.joystick[playerNum]) {
+				pad.previousLS_X[playerNum] = pad.globalLS_X[playerNum];
+				pad.previousLS_Y[playerNum] = pad.globalLS_Y[playerNum];
+				pad.globalLS_X[playerNum] = LS_X;
+				pad.globalLS_Y[playerNum] = LS_Y;
+			}
+
+			GL2JNIView.jx[playerNum] = (int) (LS_X * 126);
+			GL2JNIView.jy[playerNum] = (int) (LS_Y * 126);
+
+			GL2JNIView.lt[playerNum] = (int) (L2 * 255);
+			GL2JNIView.rt[playerNum] = (int) (R2 * 255);
+
+			if (prefs.getBoolean(Gamepad.pref_js_rbuttons + pad.portId[playerNum], true)) {
+				if (RS_Y > 0.25) {
+					handle_key(playerNum, pad.map[playerNum][0]/* A */, true);
+					pad.wasKeyStick[playerNum] = true;
+				} else if (RS_Y < 0.25) {
+					handle_key(playerNum, pad.map[playerNum][1]/* B */, true);
+					pad.wasKeyStick[playerNum] = true;
+				} else if (pad.wasKeyStick[playerNum]){
+					handle_key(playerNum, pad.map[playerNum][0], false);
+					handle_key(playerNum, pad.map[playerNum][1], false);
+					pad.wasKeyStick[playerNum] = false;
+				}
+			} else {
+				if (RS_Y > 0.25) {
+					GL2JNIView.rt[playerNum] = (int) (RS_Y * 255);
+					GL2JNIView.lt[playerNum] = (int) (L2 * 255);
+				} else if (RS_Y < 0.25) {
+					GL2JNIView.rt[playerNum] = (int) (R2 * 255);
+					GL2JNIView.lt[playerNum] = (int) (-(RS_Y) * 255);
+				}
+			}
+		}
+	}
+
 	@Override
 	public boolean onGenericMotionEvent(MotionEvent event) {
 		// Log.w("INPUT", event.toString() + " " + event.getSource());
@@ -371,53 +419,11 @@ public class GL2JNINative extends NativeActivity {
 				return false;
 			}
 			if (!pad.compat[playerNum]) {
-
-				// Joystick
-				if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
-
-					// do other things with joystick
-					float LS_X = event.getAxisValue(OuyaController.AXIS_LS_X);
-					float LS_Y = event.getAxisValue(OuyaController.AXIS_LS_Y);
-					float RS_X = event.getAxisValue(OuyaController.AXIS_RS_X);
-					float RS_Y = event.getAxisValue(OuyaController.AXIS_RS_Y);
-					float L2 = event.getAxisValue(OuyaController.AXIS_L2);
-					float R2 = event.getAxisValue(OuyaController.AXIS_R2);
-
-					if (!pad.joystick[playerNum]) {
-						pad.previousLS_X[playerNum] = pad.globalLS_X[playerNum];
-						pad.previousLS_Y[playerNum] = pad.globalLS_Y[playerNum];
-						pad.globalLS_X[playerNum] = LS_X;
-						pad.globalLS_Y[playerNum] = LS_Y;
-					}
-
-					GL2JNIView.jx[playerNum] = (int) (LS_X * 126);
-					GL2JNIView.jy[playerNum] = (int) (LS_Y * 126);
-
-					GL2JNIView.lt[playerNum] = (int) (L2 * 255);
-					GL2JNIView.rt[playerNum] = (int) (R2 * 255);
-
-					if (prefs.getBoolean(Gamepad.pref_js_rbuttons + pad.portId[playerNum], true)) {
-						if (RS_Y > 0.25) {
-							handle_key(playerNum, pad.map[playerNum][0]/* A */, true);
-							pad.wasKeyStick[playerNum] = true;
-						} else if (RS_Y < 0.25) {
-							handle_key(playerNum, pad.map[playerNum][1]/* B */, true);
-							pad.wasKeyStick[playerNum] = true;
-						} else if (pad.wasKeyStick[playerNum]){
-							handle_key(playerNum, pad.map[playerNum][0], false);
-							handle_key(playerNum, pad.map[playerNum][1], false);
-							pad.wasKeyStick[playerNum] = false;
-						}
-					} else {
-						if (RS_Y > 0.25) {
-							GL2JNIView.rt[playerNum] = (int) (RS_Y * 255);
-							GL2JNIView.lt[playerNum] = (int) (L2 * 255);
-						} else if (RS_Y < 0.25) {
-							GL2JNIView.rt[playerNum] = (int) (R2 * 255);
-							GL2JNIView.lt[playerNum] = (int) (-(RS_Y) * 255);
-						}
-					}
+				final int historySize = event.getHistorySize();
+				for (int i = 0; i < historySize; i++) {
+					processJoystickInput(event, i);
 				}
+				processJoystickInput(event, -1);
 			}
 			mView.pushInput();
 			if (!pad.joystick[playerNum] && (pad.globalLS_X[playerNum] == pad.previousLS_X[playerNum] && pad.globalLS_Y[playerNum] == pad.previousLS_Y[playerNum])