Android: Don't remove input configuration related files from old UI.

4 files changed, 456 insertions, 272 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
new file mode 100644
index 0000000000..4f9b7de0a3
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
@@ -0,0 +1,128 @@
+package org.dolphinemu.dolphinemu.dialogs;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.preference.Preference;
+import android.util.Log;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+
+import org.dolphinemu.dolphinemu.NativeLibrary;
+import org.dolphinemu.dolphinemu.utils.InputConfigFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * {@link AlertDialog} derivative that listens for
+ * motion events from controllers and joysticks.
+ */
+public final class MotionAlertDialog extends AlertDialog
+{
+	// The selected input preference
+	private final Preference inputPref;
+
+	private boolean firstEvent = true;
+	private final ArrayList<Float> m_values = new ArrayList<Float>();
+
+	/**
+	 * Constructor
+	 *
+	 * @param ctx       The current {@link Context}.
+	 * @param inputPref The Preference to show this dialog for.
+	 */
+	public MotionAlertDialog(Context ctx, Preference inputPref)
+	{
+		super(ctx);
+
+		this.inputPref = inputPref;
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent event)
+	{
+		Log.d("InputConfigFragment", "Received key event: " + event.getAction());
+		switch (event.getAction())
+		{
+			case KeyEvent.ACTION_DOWN:
+			case KeyEvent.ACTION_UP:
+				InputDevice input = event.getDevice();
+				String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Button " + event.getKeyCode();
+				NativeLibrary.SetConfig("Dolphin.ini", "Android", inputPref.getKey(), bindStr);
+				inputPref.setSummary(bindStr);
+				dismiss();
+				return true;
+
+			default:
+				return false;
+		}
+	}
+
+
+	// Method that will be called within dispatchGenericMotionEvent
+	// that handles joystick/controller movements.
+	private boolean onMotionEvent(MotionEvent event)
+	{
+		if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) == 0)
+			return false;
+
+		Log.d("InputConfigFragment", "Received motion event: " + event.getAction());
+
+		InputDevice input = event.getDevice();
+		List<InputDevice.MotionRange> motions = input.getMotionRanges();
+		if (firstEvent)
+		{
+			m_values.clear();
+
+			for (InputDevice.MotionRange range : motions)
+			{
+				m_values.add(event.getAxisValue(range.getAxis()));
+			}
+
+			firstEvent = false;
+		}
+		else
+		{
+			for (int a = 0; a < motions.size(); ++a)
+			{
+				InputDevice.MotionRange range = motions.get(a);
+
+				if (m_values.get(a) > (event.getAxisValue(range.getAxis()) + 0.5f))
+				{
+					String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "-";
+					NativeLibrary.SetConfig("Dolphin.ini", "Android", inputPref.getKey(), bindStr);
+					inputPref.setSummary(bindStr);
+					dismiss();
+				}
+				else if (m_values.get(a) < (event.getAxisValue(range.getAxis()) - 0.5f))
+				{
+					String bindStr = "Device '" + InputConfigFragment.getInputDesc(input) + "'-Axis " + range.getAxis() + "+";
+					NativeLibrary.SetConfig("Dolphin.ini", "Android", inputPref.getKey(), bindStr);
+					inputPref.setSummary(bindStr);
+					dismiss();
+				}
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent event)
+	{
+		if (onKeyDown(event.getKeyCode(), event))
+			return true;
+
+		return super.dispatchKeyEvent(event);
+	}
+
+	@Override
+	public boolean dispatchGenericMotionEvent(MotionEvent event)
+	{
+		if (onMotionEvent(event))
+			return true;
+
+		return super.dispatchGenericMotionEvent(event);
+	}
+}
\ No newline at end of file
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java
new file mode 100644
index 0000000000..cb67b90a18
--- /dev/null
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java
@@ -0,0 +1,56 @@
+package org.dolphinemu.dolphinemu.utils;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.preference.Preference;
+import android.util.AttributeSet;
+
+import org.dolphinemu.dolphinemu.R;
+import org.dolphinemu.dolphinemu.dialogs.MotionAlertDialog;
+
+/**
+ * {@link Preference} subclass that represents a preference
+ * used for assigning a key bind.
+ */
+public final class InputBindingPreference extends Preference
+{
+	/**
+	 * Constructor that is called when inflating an InputBindingPreference from XML.
+	 *
+	 * @param context The current {@link Context}.
+	 * @param attrs   The attributes of the XML tag that is inflating the preference.
+	 */
+	public InputBindingPreference(Context context, AttributeSet attrs)
+	{
+		super(context, attrs);
+	}
+
+	@Override
+	protected void onClick()
+	{
+		// Begin the creation of the input alert.
+		final MotionAlertDialog dialog = new MotionAlertDialog(getContext(), this);
+
+		// Set the cancel button.
+		dialog.setButton(AlertDialog.BUTTON_NEGATIVE, getContext().getString(R.string.cancel), new AlertDialog.OnClickListener()
+		{
+			@Override
+			public void onClick(DialogInterface dialog, int which)
+			{
+				// Do nothing. Just makes the cancel button show up.
+			}
+		});
+
+		// Set the title and description message.
+		dialog.setTitle(R.string.input_binding);
+		dialog.setMessage(String.format(getContext().getString(R.string.input_binding_descrip), getTitle()));
+
+		// Don't allow the dialog to close when a user taps
+		// outside of it. They must press cancel or provide an input.
+		dialog.setCanceledOnTouchOutside(false);
+
+		// Everything is set, show the dialog.
+		dialog.show();
+	}
+}
diff --git a/Source/Android/app/src/main/res/xml/input_prefs.xml b/Source/Android/app/src/main/res/xml/input_prefs.xml
index f6d8842f89..4ce2373af0 100644
--- a/Source/Android/app/src/main/res/xml/input_prefs.xml
+++ b/Source/Android/app/src/main/res/xml/input_prefs.xml
@@ -32,102 +32,102 @@
                 android:key="enableController1"
                 android:title="@string/enable_controller"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="InputA_0"
                 android:title="@string/button_a" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="InputB_0"
                 android:title="@string/button_b" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="InputX_0"
                 android:title="@string/button_x" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="InputY_0"
                 android:title="@string/button_y" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="InputZ_0"
                 android:title="@string/button_z" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="InputStart_0"
                 android:title="@string/button_start" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="DPadUp_0"
                 android:title="@string/dpad_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="DPadDown_0"
                 android:title="@string/dpad_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="DPadLeft_0"
                 android:title="@string/dpad_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="DPadRight_0"
                 android:title="@string/dpad_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="MainUp_0"
                 android:title="@string/main_stick_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="MainDown_0"
                 android:title="@string/main_stick_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="MainLeft_0"
                 android:title="@string/main_stick_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="MainRight_0"
                 android:title="@string/main_stick_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="CStickUp_0"
                 android:title="@string/c_stick_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="CStickDown_0"
                 android:title="@string/c_stick_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="CStickLeft_0"
                 android:title="@string/c_stick_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="CStickRight_0"
                 android:title="@string/c_stick_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="InputL_0"
                 android:title="@string/trigger_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController1"
                 android:key="InputR_0"
                 android:title="@string/trigger_right" />
@@ -139,102 +139,102 @@
                 android:key="enableController2"
                 android:title="@string/enable_controller"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="InputA_1"
                 android:title="@string/button_a" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="InputB_1"
                 android:title="@string/button_b" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="InputX_1"
                 android:title="@string/button_x" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="InputY_1"
                 android:title="@string/button_y" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="InputZ_1"
                 android:title="@string/button_z" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="InputStart_1"
                 android:title="@string/button_start" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="DPadUp_1"
                 android:title="@string/dpad_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="DPadDown_1"
                 android:title="@string/dpad_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="DPadLeft_1"
                 android:title="@string/dpad_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="DPadRight_1"
                 android:title="@string/dpad_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="MainUp_1"
                 android:title="@string/main_stick_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="MainDown_1"
                 android:title="@string/main_stick_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="MainLeft_1"
                 android:title="@string/main_stick_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="MainRight_1"
                 android:title="@string/main_stick_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="CStickUp_1"
                 android:title="@string/c_stick_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="CStickDown_1"
                 android:title="@string/c_stick_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="CStickLeft_1"
                 android:title="@string/c_stick_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="CStickRight_1"
                 android:title="@string/c_stick_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="InputL_1"
                 android:title="@string/trigger_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController2"
                 android:key="InputR_1"
                 android:title="@string/trigger_right" />
@@ -246,102 +246,102 @@
                 android:key="enableController3"
                 android:title="@string/enable_controller"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="InputA_2"
                 android:title="@string/button_a" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="InputB_2"
                 android:title="@string/button_b" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="InputX_2"
                 android:title="@string/button_x" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="InputY_2"
                 android:title="@string/button_y" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="InputZ_2"
                 android:title="@string/button_z" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="InputStart_2"
                 android:title="@string/button_start" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="DPadUp_2"
                 android:title="@string/dpad_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="DPadDown_2"
                 android:title="@string/dpad_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="DPadLeft_2"
                 android:title="@string/dpad_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="DPadRight_2"
                 android:title="@string/dpad_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="MainUp_2"
                 android:title="@string/main_stick_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="MainDown_2"
                 android:title="@string/main_stick_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="MainLeft_2"
                 android:title="@string/main_stick_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="MainRight_2"
                 android:title="@string/main_stick_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="CStickUp_2"
                 android:title="@string/c_stick_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="CStickDown_2"
                 android:title="@string/c_stick_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="CStickLeft_2"
                 android:title="@string/c_stick_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="CStickRight_2"
                 android:title="@string/c_stick_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="InputL_2"
                 android:title="@string/trigger_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController3"
                 android:key="InputR_2"
                 android:title="@string/trigger_right" />
@@ -353,102 +353,102 @@
                 android:key="enableController4"
                 android:title="@string/enable_controller"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="InputA_3"
                 android:title="@string/button_a" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="InputB_3"
                 android:title="@string/button_b" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="InputX_3"
                 android:title="@string/button_x" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="InputY_3"
                 android:title="@string/button_y" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="InputZ_3"
                 android:title="@string/button_z" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="InputStart_3"
                 android:title="@string/button_start" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="DPadUp_3"
                 android:title="@string/dpad_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="DPadDown_3"
                 android:title="@string/dpad_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="DPadLeft_3"
                 android:title="@string/dpad_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="DPadRight_3"
                 android:title="@string/dpad_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="MainUp_3"
                 android:title="@string/main_stick_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="MainDown_3"
                 android:title="@string/main_stick_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="MainLeft_3"
                 android:title="@string/main_stick_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="MainRight_3"
                 android:title="@string/main_stick_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="CStickUp_3"
                 android:title="@string/c_stick_up" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="CStickDown_3"
                 android:title="@string/c_stick_down" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="CStickLeft_3"
                 android:title="@string/c_stick_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="CStickRight_3"
                 android:title="@string/c_stick_right" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="InputL_3"
                 android:title="@string/trigger_left" />
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableController4"
                 android:key="InputR_3"
                 android:title="@string/trigger_right" />
@@ -469,142 +469,142 @@
                 android:key="enableWiimote1"
                 android:title="@string/enable_wiimote"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteInputA_0"
                 android:title="@string/button_a"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteInputB_0"
                 android:title="@string/button_b"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteInputOne_0"
                 android:title="@string/button_one"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteInputTwo_0"
                 android:title="@string/button_two"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteInputPlus_0"
                 android:title="@string/button_plus"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteInputMinus_0"
                 android:title="@string/button_minus"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteInputHome_0"
                 android:title="@string/button_home"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteDPadUp_0"
                 android:title="@string/dpad_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteDPadDown_0"
                 android:title="@string/dpad_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteDPadLeft_0"
                 android:title="@string/dpad_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteDPadRight_0"
                 android:title="@string/dpad_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteIRUp_0"
                 android:title="@string/ir_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteIRDown_0"
                 android:title="@string/ir_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteIRLeft_0"
                 android:title="@string/ir_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteIRRight_0"
                 android:title="@string/ir_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteIRForward_0"
                 android:title="@string/ir_forward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteIRBackward_0"
                 android:title="@string/ir_backward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteSwingUp_0"
                 android:title="@string/swing_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteSwingDown_0"
                 android:title="@string/swing_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteSwingLeft_0"
                 android:title="@string/swing_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteSwingRight_0"
                 android:title="@string/swing_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteTiltForward_0"
                 android:title="@string/tilt_forward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteTiltBackward_0"
                 android:title="@string/tilt_backward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteTiltLeft_0"
                 android:title="@string/tilt_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteTiltRight_0"
                 android:title="@string/tilt_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteShakeX_0"
                 android:title="@string/shake_x"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteShakeY_0"
                 android:title="@string/shake_y"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote1"
                 android:key="WiimoteShakeZ_0"
                 android:title="@string/shake_z"/>
@@ -617,142 +617,142 @@
                 android:key="enableWiimote2"
                 android:title="@string/enable_wiimote"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteInputA_1"
                 android:title="@string/button_a"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteInputB_1"
                 android:title="@string/button_b"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteInputOne_1"
                 android:title="@string/button_one"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteInputTwo_1"
                 android:title="@string/button_two"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteInputPlus_1"
                 android:title="@string/button_plus"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteInputMinus_1"
                 android:title="@string/button_minus"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteInputHome_1"
                 android:title="@string/button_home"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteDPadUp_1"
                 android:title="@string/dpad_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteDPadDown_1"
                 android:title="@string/dpad_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteDPadLeft_1"
                 android:title="@string/dpad_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteDPadRight_1"
                 android:title="@string/dpad_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteIRUp_1"
                 android:title="@string/ir_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteIRDown_1"
                 android:title="@string/ir_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteIRLeft_1"
                 android:title="@string/ir_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteIRRight_1"
                 android:title="@string/ir_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteIRForward_1"
                 android:title="@string/ir_forward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteIRBackward_1"
                 android:title="@string/ir_backward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteSwingUp_1"
                 android:title="@string/swing_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteSwingDown_1"
                 android:title="@string/swing_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteSwingLeft_1"
                 android:title="@string/swing_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteSwingRight_1"
                 android:title="@string/swing_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteTiltForward_1"
                 android:title="@string/tilt_forward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteTiltBackward_1"
                 android:title="@string/tilt_backward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteTiltLeft_1"
                 android:title="@string/tilt_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteTiltRight_1"
                 android:title="@string/tilt_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteShakeX_1"
                 android:title="@string/shake_x"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteShakeY_1"
                 android:title="@string/shake_y"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote2"
                 android:key="WiimoteShakeZ_1"
                 android:title="@string/shake_z"/>
@@ -765,142 +765,142 @@
                 android:key="enableWiimote3"
                 android:title="@string/enable_wiimote"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteInputA_2"
                 android:title="@string/button_a"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteInputB_2"
                 android:title="@string/button_b"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteInputOne_2"
                 android:title="@string/button_one"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteInputTwo_2"
                 android:title="@string/button_two"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteInputPlus_2"
                 android:title="@string/button_plus"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteInputMinus_2"
                 android:title="@string/button_minus"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteInputHome_2"
                 android:title="@string/button_home"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteDPadUp_2"
                 android:title="@string/dpad_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteDPadDown_2"
                 android:title="@string/dpad_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteDPadLeft_2"
                 android:title="@string/dpad_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteDPadRight_2"
                 android:title="@string/dpad_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteIRUp_2"
                 android:title="@string/ir_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteIRDown_2"
                 android:title="@string/ir_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteIRLeft_2"
                 android:title="@string/ir_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteIRRight_2"
                 android:title="@string/ir_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteIRForward_2"
                 android:title="@string/ir_forward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteIRBackward_2"
                 android:title="@string/ir_backward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteSwingUp_2"
                 android:title="@string/swing_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteSwingDown_2"
                 android:title="@string/swing_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteSwingLeft_2"
                 android:title="@string/swing_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteSwingRight_2"
                 android:title="@string/swing_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteTiltForward_2"
                 android:title="@string/tilt_forward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteTiltBackward_2"
                 android:title="@string/tilt_backward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteTiltLeft_2"
                 android:title="@string/tilt_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteTiltRight_2"
                 android:title="@string/tilt_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteShakeX_2"
                 android:title="@string/shake_x"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteShakeY_2"
                 android:title="@string/shake_y"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote3"
                 android:key="WiimoteShakeZ_2"
                 android:title="@string/shake_z"/>
@@ -913,142 +913,142 @@
                 android:key="enableWiimote4"
                 android:title="@string/enable_wiimote"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteInputA_3"
                 android:title="@string/button_a"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteInputB_3"
                 android:title="@string/button_b"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteInputOne_3"
                 android:title="@string/button_one"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteInputTwo_3"
                 android:title="@string/button_two"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteInputPlus_3"
                 android:title="@string/button_plus"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteInputMinus_3"
                 android:title="@string/button_minus"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteInputHome_3"
                 android:title="@string/button_home"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteDPadUp_3"
                 android:title="@string/dpad_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteDPadDown_3"
                 android:title="@string/dpad_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteDPadLeft_3"
                 android:title="@string/dpad_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteDPadRight_3"
                 android:title="@string/dpad_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteIRUp_3"
                 android:title="@string/ir_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteIRDown_3"
                 android:title="@string/ir_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteIRLeft_3"
                 android:title="@string/ir_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteIRRight_3"
                 android:title="@string/ir_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteIRForward_3"
                 android:title="@string/ir_forward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteIRBackward_3"
                 android:title="@string/ir_backward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteSwingUp_3"
                 android:title="@string/swing_up"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteSwingDown_3"
                 android:title="@string/swing_down"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteSwingLeft_3"
                 android:title="@string/swing_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteSwingRight_3"
                 android:title="@string/swing_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteTiltForward_3"
                 android:title="@string/tilt_forward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteTiltBackward_3"
                 android:title="@string/tilt_backward"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteTiltLeft_3"
                 android:title="@string/tilt_left"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteTiltRight_3"
                 android:title="@string/tilt_right"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteShakeX_3"
                 android:title="@string/shake_x"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteShakeY_3"
                 android:title="@string/shake_y"/>
 
-            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+            <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                 android:dependency="enableWiimote4"
                 android:key="WiimoteShakeZ_3"
                 android:title="@string/shake_z"/>
diff --git a/Source/Android/app/src/main/res/xml/preferences.xml b/Source/Android/app/src/main/res/xml/preferences.xml
index b2af687783..a05cc7c14d 100644
--- a/Source/Android/app/src/main/res/xml/preferences.xml
+++ b/Source/Android/app/src/main/res/xml/preferences.xml
@@ -68,102 +68,102 @@
                     android:key="enableController1"
                     android:title="@string/enable_controller"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="InputA_0"
                     android:title="@string/button_a"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="InputB_0"
                     android:title="@string/button_b"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="InputX_0"
                     android:title="@string/button_x"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="InputY_0"
                     android:title="@string/button_y"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="InputZ_0"
                     android:title="@string/button_z"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="InputStart_0"
                     android:title="@string/button_start"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="DPadUp_0"
                     android:title="@string/dpad_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="DPadDown_0"
                     android:title="@string/dpad_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="DPadLeft_0"
                     android:title="@string/dpad_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="DPadRight_0"
                     android:title="@string/dpad_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="MainUp_0"
                     android:title="@string/main_stick_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="MainDown_0"
                     android:title="@string/main_stick_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="MainLeft_0"
                     android:title="@string/main_stick_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="MainRight_0"
                     android:title="@string/main_stick_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="CStickUp_0"
                     android:title="@string/c_stick_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="CStickDown_0"
                     android:title="@string/c_stick_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="CStickLeft_0"
                     android:title="@string/c_stick_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="CStickRight_0"
                     android:title="@string/c_stick_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="InputL_0"
                     android:title="@string/trigger_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController1"
                     android:key="InputR_0"
                     android:title="@string/trigger_right"/>
@@ -178,102 +178,102 @@
                     android:key="enableController2"
                     android:title="@string/enable_controller"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="InputA_1"
                     android:title="@string/button_a"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="InputB_1"
                     android:title="@string/button_b"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="InputX_1"
                     android:title="@string/button_x"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="InputY_1"
                     android:title="@string/button_y"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="InputZ_1"
                     android:title="@string/button_z"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="InputStart_1"
                     android:title="@string/button_start"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="DPadUp_1"
                     android:title="@string/dpad_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="DPadDown_1"
                     android:title="@string/dpad_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="DPadLeft_1"
                     android:title="@string/dpad_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="DPadRight_1"
                     android:title="@string/dpad_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="MainUp_1"
                     android:title="@string/main_stick_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="MainDown_1"
                     android:title="@string/main_stick_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="MainLeft_1"
                     android:title="@string/main_stick_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="MainRight_1"
                     android:title="@string/main_stick_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="CStickUp_1"
                     android:title="@string/c_stick_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="CStickDown_1"
                     android:title="@string/c_stick_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="CStickLeft_1"
                     android:title="@string/c_stick_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="CStickRight_1"
                     android:title="@string/c_stick_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="InputL_1"
                     android:title="@string/trigger_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController2"
                     android:key="InputR_1"
                     android:title="@string/trigger_right"/>
@@ -287,102 +287,102 @@
                     android:key="enableController3"
                     android:title="@string/enable_controller"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="InputA_2"
                     android:title="@string/button_a"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="InputB_2"
                     android:title="@string/button_b"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="InputX_2"
                     android:title="@string/button_x"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="InputY_2"
                     android:title="@string/button_y"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="InputZ_2"
                     android:title="@string/button_z"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="InputStart_2"
                     android:title="@string/button_start"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="DPadUp_2"
                     android:title="@string/dpad_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="DPadDown_2"
                     android:title="@string/dpad_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="DPadLeft_2"
                     android:title="@string/dpad_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="DPadRight_2"
                     android:title="@string/dpad_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="MainUp_2"
                     android:title="@string/main_stick_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="MainDown_2"
                     android:title="@string/main_stick_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="MainLeft_2"
                     android:title="@string/main_stick_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="MainRight_2"
                     android:title="@string/main_stick_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="CStickUp_2"
                     android:title="@string/c_stick_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="CStickDown_2"
                     android:title="@string/c_stick_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="CStickLeft_2"
                     android:title="@string/c_stick_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="CStickRight_2"
                     android:title="@string/c_stick_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="InputL_2"
                     android:title="@string/trigger_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController3"
                     android:key="InputR_2"
                     android:title="@string/trigger_right"/>
@@ -397,102 +397,102 @@
                     android:key="enableController4"
                     android:title="@string/enable_controller"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="InputA_3"
                     android:title="@string/button_a"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="InputB_3"
                     android:title="@string/button_b"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="InputX_3"
                     android:title="@string/button_x"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="InputY_3"
                     android:title="@string/button_y"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="InputZ_3"
                     android:title="@string/button_z"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="InputStart_3"
                     android:title="@string/button_start"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="DPadUp_3"
                     android:title="@string/dpad_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="DPadDown_3"
                     android:title="@string/dpad_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="DPadLeft_3"
                     android:title="@string/dpad_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="DPadRight_3"
                     android:title="@string/dpad_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="MainUp_3"
                     android:title="@string/main_stick_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="MainDown_3"
                     android:title="@string/main_stick_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="MainLeft_3"
                     android:title="@string/main_stick_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="MainRight_3"
                     android:title="@string/main_stick_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="CStickUp_3"
                     android:title="@string/c_stick_up"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="CStickDown_3"
                     android:title="@string/c_stick_down"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="CStickLeft_3"
                     android:title="@string/c_stick_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="CStickRight_3"
                     android:title="@string/c_stick_right"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="InputL_3"
                     android:title="@string/trigger_left"/>
 
-                <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
                     android:dependency="enableController4"
                     android:key="InputR_3"
                     android:title="@string/trigger_right"/>