Android: Remove unused stuff

7 files changed, 11 insertions, 37 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
index 5449dc8ee2..464d841277 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -289,13 +289,6 @@ public final class NativeLibrary
 	public static native String GetVersionString();
 
 	/**
-	 * Returns if the phone supports NEON or not
-	 *
-	 * @return true if it supports NEON, false otherwise.
-	 */
-	public static native boolean SupportsNEON();
-
-	/**
 	 * Saves a screen capture of the game
 	 */
 	public static native void SaveScreenShot();
@@ -359,21 +352,6 @@ public final class NativeLibrary
 	 */
 	public static native void WriteProfileResults();
 
-	/**
-	 * @return If we have an alert
-	 */
-	public static native boolean HasAlertMsg();
-
-	/**
-	 * @return The alert string
-	 */
-	public static native String GetAlertMsg();
-
-	/**
-	 * Clears event in the JNI so we can continue onward
-	 */
-	public static native void ClearAlertMsg();
-
 	/** Native EGL functions not exposed by Java bindings **/
 	public static native void eglBindAPI(int api);
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
index 6c75e55544..7f4421b101 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
@@ -121,7 +121,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 	{
 		if (isInEditMode())
 		{
-			return onTouchWhileEditing(v, event);
+			return onTouchWhileEditing(event);
 		}
 
 		int pointerIndex = event.getActionIndex();
@@ -209,7 +209,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 		return true;
 	}
 
-	public boolean onTouchWhileEditing(View v, MotionEvent event)
+	public boolean onTouchWhileEditing(MotionEvent event)
 	{
 		int pointerIndex = event.getActionIndex();
 		int fingerPositionX = (int)event.getX(pointerIndex);
@@ -229,13 +229,13 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 					if (mButtonBeingConfigured == null && button.getBounds().contains(fingerPositionX, fingerPositionY))
 					{
 						mButtonBeingConfigured = button;
-						mButtonBeingConfigured.onConfigureTouch(v, event);
+						mButtonBeingConfigured.onConfigureTouch(event);
 					}
 					break;
 				case MotionEvent.ACTION_MOVE:
 					if (mButtonBeingConfigured != null)
 					{
-						mButtonBeingConfigured.onConfigureTouch(v, event);
+						mButtonBeingConfigured.onConfigureTouch(event);
 						invalidate();
 						return true;
 					}
@@ -264,13 +264,13 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 					if (mButtonBeingConfigured == null && dpad.getBounds().contains(fingerPositionX, fingerPositionY))
 					{
 						mDpadBeingConfigured = dpad;
-						mDpadBeingConfigured.onConfigureTouch(v, event);
+						mDpadBeingConfigured.onConfigureTouch(event);
 					}
 					break;
 				case MotionEvent.ACTION_MOVE:
 					if (mDpadBeingConfigured != null)
 					{
-						mDpadBeingConfigured.onConfigureTouch(v, event);
+						mDpadBeingConfigured.onConfigureTouch(event);
 						invalidate();
 						return true;
 					}
@@ -297,13 +297,13 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 					if (mJoystickBeingConfigured == null && joystick.getBounds().contains(fingerPositionX, fingerPositionY))
 					{
 						mJoystickBeingConfigured = joystick;
-						mJoystickBeingConfigured.onConfigureTouch(v, event);
+						mJoystickBeingConfigured.onConfigureTouch(event);
 					}
 					break;
 				case MotionEvent.ACTION_MOVE:
 					if (mJoystickBeingConfigured != null)
 					{
-						mJoystickBeingConfigured.onConfigureTouch(v, event);
+						mJoystickBeingConfigured.onConfigureTouch(event);
 						invalidate();
 					}
 					break;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
index 8601756faa..7d692c36ba 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
@@ -47,7 +47,7 @@ public final class InputOverlayDrawableButton extends BitmapDrawable
 		return mButtonType;
 	}
 
-	public boolean onConfigureTouch(View v, MotionEvent event)
+	public boolean onConfigureTouch(MotionEvent event)
 	{
 		int pointerIndex = event.getActionIndex();
 		int fingerPositionX = (int)event.getX(pointerIndex);
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
index e0ae7b6a52..56ee4b2e18 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
@@ -55,7 +55,7 @@ public final class InputOverlayDrawableDpad extends BitmapDrawable
 		return mButtonType[direction];
 	}
 
-	public boolean onConfigureTouch(View v, MotionEvent event)
+	public boolean onConfigureTouch(MotionEvent event)
 	{
 		int pointerIndex = event.getActionIndex();
 		int fingerPositionX = (int)event.getX(pointerIndex);
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
index 885d84cb11..65b63274ca 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
@@ -120,7 +120,7 @@ public final class InputOverlayDrawableJoystick extends BitmapDrawable
 		}
 	}
 
-	public boolean onConfigureTouch(View v, MotionEvent event)
+	public boolean onConfigureTouch(MotionEvent event)
 	{
 		int pointerIndex = event.getActionIndex();
 		int fingerPositionX = (int)event.getX(pointerIndex);
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java
index 3664fd6abf..bb690387dd 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.utils;
 
-import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.hardware.usb.UsbConfiguration;
@@ -15,7 +14,6 @@ import org.dolphinemu.dolphinemu.services.USBPermService;
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 public class Java_WiimoteAdapter
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java
index 316315cf65..5f1675200a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java
@@ -66,9 +66,7 @@ public final class SettingsFile
 
 	public static final String KEY_SKIP_EFB = "EFBAccessEnable";
 	public static final String KEY_IGNORE_FORMAT = "EFBEmulateFormatChanges";
-	public static final String KEY_EFB_COPY = "EFBCopyEnable";
 	public static final String KEY_EFB_TEXTURE = "EFBToTextureEnable";
-	public static final String KEY_EFB_CACHE = "EFBCopyCacheEnable";
 	public static final String KEY_TEXCACHE_ACCURACY = "SafeTextureCacheColorSamples";
 	public static final String KEY_XFB = "UseXFB";
 	public static final String KEY_XFB_REAL = "UseRealXFB";