diff options
| author | sigmabeta <sigmabeta@users.noreply.github.com> | 2015-06-09 10:31:15 -0400 |
|---|---|---|
| committer | sigmabeta <sigmabeta@users.noreply.github.com> | 2015-06-09 10:31:15 -0400 |
| commit | 5d5fc88a7010e8f6598cb9e44ee746cdfca07314 (patch) | |
| tree | 27a08bc92225a5038fbd689c4110136408ce3375 /Source/Android/app/src | |
| parent | e47e4c677ad22895f8c8bc78676dd295e36f2695 (diff) | |
Android: Persist previously-set controller bindings on the Settings menu.
Diffstat (limited to 'Source/Android/app/src')
8 files changed, 162 insertions, 1388 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 14ca650dd4..e1804abf96 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -18,7 +18,6 @@ import android.view.View; import org.dolphinemu.dolphinemu.NativeLibrary; import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.fragments.EmulationFragment; -import org.dolphinemu.dolphinemu.utils.InputConfigFragment; import java.util.List; @@ -274,7 +273,7 @@ public final class EmulationActivity extends Activity return false; } InputDevice input = event.getDevice(); - boolean handled = NativeLibrary.onGamePadEvent(InputConfigFragment.getInputDesc(input), event.getKeyCode(), action); + boolean handled = NativeLibrary.onGamePadEvent(input.getDescriptor(), event.getKeyCode(), action); return handled; } @@ -295,7 +294,7 @@ public final class EmulationActivity extends Activity for (InputDevice.MotionRange range : motions) { - NativeLibrary.onGamePadMoveEvent(InputConfigFragment.getInputDesc(input), range.getAxis(), event.getAxisValue(range.getAxis())); + NativeLibrary.onGamePadMoveEvent(input.getDescriptor(), range.getAxis(), event.getAxisValue(range.getAxis())); } return true; 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 index 4f9b7de0a3..aea1f39df0 100644 --- 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 @@ -2,14 +2,15 @@ package org.dolphinemu.dolphinemu.dialogs; import android.app.AlertDialog; import android.content.Context; +import android.content.SharedPreferences; import android.preference.Preference; +import android.preference.PreferenceManager; 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; @@ -47,11 +48,10 @@ public final class MotionAlertDialog extends AlertDialog { 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(); + saveInput(input, event, null, false); + return true; default: @@ -90,17 +90,11 @@ public final class MotionAlertDialog extends AlertDialog 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(); + saveInput(input, null, range, false); } 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(); + saveInput(input, null, range, true); } } } @@ -125,4 +119,66 @@ public final class MotionAlertDialog extends AlertDialog return super.dispatchGenericMotionEvent(event); } + + /** + * Saves the provided input setting both to the INI file (so native code can use it) and as an + * Android preference (so it persists correctly, and is human-readable.) + * + * @param device Required; the InputDevice from which the input event originated. + * @param keyEvent If the event was a button push, this KeyEvent represents it and is required. + * @param motionRange If the event was an axis movement, this MotionRange represents it and is required. + * @param axisPositive If the event was an axis movement, this boolean indicates the direction and is required. + */ + private void saveInput(InputDevice device, KeyEvent keyEvent, InputDevice.MotionRange motionRange, boolean axisPositive) + { + String bindStr = null; + String uiString = null; + + if (keyEvent != null) + { + bindStr = "Device '" + device.getDescriptor() + "'-Button " + keyEvent.getKeyCode(); + uiString = device.getName() + ": Button " + keyEvent.getKeyCode(); + } + + if (motionRange != null) + { + if (axisPositive) + { + bindStr = "Device '" + device.getDescriptor() + "'-Axis " + motionRange.getAxis() + "+"; + uiString = device.getName() + ": Axis " + motionRange.getAxis() + "+"; + } + else + { + bindStr = "Device '" + device.getDescriptor() + "'-Axis " + motionRange.getAxis() + "-"; + uiString = device.getName() + ": Axis " + motionRange.getAxis() + "-"; + } + } + + if (bindStr != null) + { + NativeLibrary.SetConfig("Dolphin.ini", "Android", inputPref.getKey(), bindStr); + } + else + { + Log.e("DolphinEmu", "Failed to save input to INI."); + } + + + if (uiString != null) + { + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext()); + SharedPreferences.Editor editor = preferences.edit(); + + editor.putString(inputPref.getKey(), uiString); + editor.apply(); + + inputPref.setSummary(uiString); + } + else + { + Log.e("DolphinEmu", "Failed to save input to preference."); + } + + dismiss(); + } }
\ 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 index cb67b90a18..9e651fc102 100644 --- 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 @@ -3,6 +3,7 @@ package org.dolphinemu.dolphinemu.utils; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.preference.EditTextPreference; import android.preference.Preference; import android.util.AttributeSet; @@ -13,7 +14,7 @@ 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 +public final class InputBindingPreference extends EditTextPreference { /** * Constructor that is called when inflating an InputBindingPreference from XML. @@ -53,4 +54,13 @@ public final class InputBindingPreference extends Preference // Everything is set, show the dialog. dialog.show(); } + + @Override + public CharSequence getSummary() + { + String summary = super.getSummary().toString(); + return String.format(summary, getText()); + } + + } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputConfigFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputConfigFragment.java deleted file mode 100644 index ce1e4a2145..0000000000 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputConfigFragment.java +++ /dev/null @@ -1,103 +0,0 @@ -/** - * Copyright 2013 Dolphin Emulator Project - * Licensed under GPLv2+ - * Refer to the license.txt file included. - */ - -package org.dolphinemu.dolphinemu.utils; - -import android.app.Fragment; -import android.os.Build; -import android.os.Bundle; -import android.preference.Preference; -import android.preference.PreferenceFragment; -import android.view.InputDevice; - -import org.dolphinemu.dolphinemu.NativeLibrary; -import org.dolphinemu.dolphinemu.R; - -import java.util.List; - -/** - * The {@link Fragment} responsible for implementing the functionality - * within the input control mapping config. - */ -public final class InputConfigFragment extends PreferenceFragment -{ - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - - // Expand the preferences from the XML. - addPreferencesFromResource(R.xml.input_prefs); - - // Set the summary messages of the preferences to whatever binding - // is currently set within the Dolphin config. - final String[] gamecubeKeys = - { - "InputA", "InputB", "InputX", "InputY", "InputZ", "InputStart", - "DPadUp", "DPadDown", "DPadLeft", "DPadRight", - "MainUp", "MainDown", "MainLeft", "MainRight", - "CStickUp", "CStickDown", "CStickLeft", "CStickRight", - "InputL", "InputR" - }; - - final String[] wiimoteKeys = - { - "WiimoteInputA", "WiimoteInputB", "WiimoteInputOne", "WiimoteInputTwo", "WiimoteInputPlus", "WiimoteInputMinus", "WiimoteInputHome", - "WiimoteIRUp", "WiimoteIRDown", "WiimoteIRLeft", "WiimoteIRRight", "WiimoteIRForward", "WiimoteIRBackward", - "WiimoteSwingUp", "WiimoteSwingDown", "WiimoteSwingLeft", "WiimoteSwingRight", - "WiimoteTiltForward", "WiimoteTiltBackward", "WiimoteTiltLeft", "WiimoteTiltRight", - "WiimoteShakeX", "WiimoteShakeY", "WiimoteShakeZ", - "WiimoteDPadUp", "WiimoteDPadDown", "WiimoteDPadLeft", "WiimoteDPadRight" - }; - - for (int i = 0; i < 4; i++) - { - // Loop through the keys for all 4 GameCube controllers. - for (String key : gamecubeKeys) - { - final String binding = NativeLibrary.GetConfig("Dolphin.ini", "Android", key+"_"+i, "None"); - final Preference pref = findPreference(key+"_"+i); - pref.setSummary(binding); - } - - // Loop through the keys for the Wiimote - /*for (String key : wiimoteKeys) - { - final String binding = NativeLibrary.GetConfig("Dolphin.ini", "Android", key+"_"+i, "None"); - final Preference pref = findPreference(key+"_"+i); - pref.setSummary(binding); - }*/ - } - } - - /** - * Gets the descriptor for the given {@link InputDevice}. - * - * @param input The {@link InputDevice} to get the descriptor of. - * - * @return the descriptor for the given {@link InputDevice}. - */ - public static String getInputDesc(InputDevice input) - { - if (input == null) - return "null"; // Happens when the InputDevice is from an unknown source - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) - { - return input.getDescriptor(); - } - else - { - List<InputDevice.MotionRange> motions = input.getMotionRanges(); - StringBuilder fakeid = new StringBuilder(); - - for (InputDevice.MotionRange range : motions) - fakeid.append(range.getAxis()); - - return fakeid.toString(); - } - } -} diff --git a/Source/Android/app/src/main/res/xml/cpu_prefs.xml b/Source/Android/app/src/main/res/xml/cpu_prefs.xml deleted file mode 100644 index 59ef76ed46..0000000000 --- a/Source/Android/app/src/main/res/xml/cpu_prefs.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- CPU Settings --> - <CheckBoxPreference - android:defaultValue="false" - android:key="dualCorePref" - android:summary="@string/dual_core_descrip" - android:title="@string/dual_core" /> - - <org.dolphinemu.dolphinemu.settings.custom.UpdatingListPreference - android:key="cpuCorePref" - android:summary="@string/cpu_core_desc" - android:title="@string/cpu_core" /> - - <CheckBoxPreference - android:defaultValue="false" - android:key="fastmemPref" - android:summary="@string/fastmem_desc" - android:title="@string/fastmem" /> - -</PreferenceScreen>
\ No newline at end of file diff --git a/Source/Android/app/src/main/res/xml/input_prefs.xml b/Source/Android/app/src/main/res/xml/input_prefs.xml deleted file mode 100644 index 4ce2373af0..0000000000 --- a/Source/Android/app/src/main/res/xml/input_prefs.xml +++ /dev/null @@ -1,1057 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - android:title="@string/input_settings"> - <PreferenceScreen - android:key="input_overlay" - android:title="@string/input_overlay" - android:summary="@string/input_overlay_desc"> - <Preference - android:key="inputOverlayConfigPref" - android:summary="@string/input_overlay_layout_desc" - android:title="@string/input_overlay_layout"> - <intent - android:targetPackage="org.dolphinemu.dolphinemu" - android:targetClass="org.dolphinemu.dolphinemu.settings.input.overlayconfig.OverlayConfigActivity"/> - </Preference> - <SeekBarPreference - android:key="controls_size" - android:title="@string/controls_size" - android:defaultValue="25" - android:max="75"> - </SeekBarPreference> - </PreferenceScreen> - - <!-- GameCube controller bindings --> - <PreferenceScreen - android:key="gamecube_bindings" - android:title="@string/gamecube_bindings"> - <PreferenceScreen - android:key="gamecube_bindings_control_0" - android:title="@string/controller_0"> - <CheckBoxPreference - android:key="enableController1" - android:title="@string/enable_controller"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="InputA_0" - android:title="@string/button_a" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="InputB_0" - android:title="@string/button_b" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="InputX_0" - android:title="@string/button_x" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="InputY_0" - android:title="@string/button_y" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="InputZ_0" - android:title="@string/button_z" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="InputStart_0" - android:title="@string/button_start" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="DPadUp_0" - android:title="@string/dpad_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="DPadDown_0" - android:title="@string/dpad_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="DPadLeft_0" - android:title="@string/dpad_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="DPadRight_0" - android:title="@string/dpad_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="MainUp_0" - android:title="@string/main_stick_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="MainDown_0" - android:title="@string/main_stick_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="MainLeft_0" - android:title="@string/main_stick_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="MainRight_0" - android:title="@string/main_stick_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="CStickUp_0" - android:title="@string/c_stick_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="CStickDown_0" - android:title="@string/c_stick_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="CStickLeft_0" - android:title="@string/c_stick_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="CStickRight_0" - android:title="@string/c_stick_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="InputL_0" - android:title="@string/trigger_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController1" - android:key="InputR_0" - android:title="@string/trigger_right" /> - </PreferenceScreen> - <PreferenceScreen - android:key="gamecube_bindings_control_1" - android:title="@string/controller_1"> - <CheckBoxPreference - android:key="enableController2" - android:title="@string/enable_controller"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="InputA_1" - android:title="@string/button_a" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="InputB_1" - android:title="@string/button_b" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="InputX_1" - android:title="@string/button_x" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="InputY_1" - android:title="@string/button_y" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="InputZ_1" - android:title="@string/button_z" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="InputStart_1" - android:title="@string/button_start" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="DPadUp_1" - android:title="@string/dpad_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="DPadDown_1" - android:title="@string/dpad_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="DPadLeft_1" - android:title="@string/dpad_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="DPadRight_1" - android:title="@string/dpad_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="MainUp_1" - android:title="@string/main_stick_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="MainDown_1" - android:title="@string/main_stick_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="MainLeft_1" - android:title="@string/main_stick_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="MainRight_1" - android:title="@string/main_stick_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="CStickUp_1" - android:title="@string/c_stick_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="CStickDown_1" - android:title="@string/c_stick_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="CStickLeft_1" - android:title="@string/c_stick_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="CStickRight_1" - android:title="@string/c_stick_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="InputL_1" - android:title="@string/trigger_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController2" - android:key="InputR_1" - android:title="@string/trigger_right" /> - </PreferenceScreen> - <PreferenceScreen - android:key="gamecube_bindings_control_2" - android:title="@string/controller_2"> - <CheckBoxPreference - android:key="enableController3" - android:title="@string/enable_controller"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="InputA_2" - android:title="@string/button_a" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="InputB_2" - android:title="@string/button_b" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="InputX_2" - android:title="@string/button_x" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="InputY_2" - android:title="@string/button_y" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="InputZ_2" - android:title="@string/button_z" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="InputStart_2" - android:title="@string/button_start" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="DPadUp_2" - android:title="@string/dpad_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="DPadDown_2" - android:title="@string/dpad_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="DPadLeft_2" - android:title="@string/dpad_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="DPadRight_2" - android:title="@string/dpad_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="MainUp_2" - android:title="@string/main_stick_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="MainDown_2" - android:title="@string/main_stick_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="MainLeft_2" - android:title="@string/main_stick_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="MainRight_2" - android:title="@string/main_stick_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="CStickUp_2" - android:title="@string/c_stick_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="CStickDown_2" - android:title="@string/c_stick_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="CStickLeft_2" - android:title="@string/c_stick_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="CStickRight_2" - android:title="@string/c_stick_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="InputL_2" - android:title="@string/trigger_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController3" - android:key="InputR_2" - android:title="@string/trigger_right" /> - </PreferenceScreen> - <PreferenceScreen - android:key="gamecube_bindings_control_3" - android:title="@string/controller_3"> - <CheckBoxPreference - android:key="enableController4" - android:title="@string/enable_controller"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="InputA_3" - android:title="@string/button_a" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="InputB_3" - android:title="@string/button_b" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="InputX_3" - android:title="@string/button_x" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="InputY_3" - android:title="@string/button_y" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="InputZ_3" - android:title="@string/button_z" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="InputStart_3" - android:title="@string/button_start" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="DPadUp_3" - android:title="@string/dpad_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="DPadDown_3" - android:title="@string/dpad_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="DPadLeft_3" - android:title="@string/dpad_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="DPadRight_3" - android:title="@string/dpad_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="MainUp_3" - android:title="@string/main_stick_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="MainDown_3" - android:title="@string/main_stick_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="MainLeft_3" - android:title="@string/main_stick_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="MainRight_3" - android:title="@string/main_stick_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="CStickUp_3" - android:title="@string/c_stick_up" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="CStickDown_3" - android:title="@string/c_stick_down" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="CStickLeft_3" - android:title="@string/c_stick_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="CStickRight_3" - android:title="@string/c_stick_right" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="InputL_3" - android:title="@string/trigger_left" /> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableController4" - android:key="InputR_3" - android:title="@string/trigger_right" /> - </PreferenceScreen> - </PreferenceScreen> - - <!-- Wiimote controller bindings --> - <!-- - <PreferenceScreen - android:key="wiimote_bindings" - android:title="@string/wiimote_bindings"> - - <PreferenceScreen - android:key="wiimote_bindings_control_0" - android:title="@string/wiimote_0"> - - <CheckBoxPreference - android:key="enableWiimote1" - android:title="@string/enable_wiimote"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteInputA_0" - android:title="@string/button_a"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteInputB_0" - android:title="@string/button_b"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteInputOne_0" - android:title="@string/button_one"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteInputTwo_0" - android:title="@string/button_two"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteInputPlus_0" - android:title="@string/button_plus"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteInputMinus_0" - android:title="@string/button_minus"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteInputHome_0" - android:title="@string/button_home"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteDPadUp_0" - android:title="@string/dpad_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteDPadDown_0" - android:title="@string/dpad_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteDPadLeft_0" - android:title="@string/dpad_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteDPadRight_0" - android:title="@string/dpad_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteIRUp_0" - android:title="@string/ir_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteIRDown_0" - android:title="@string/ir_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteIRLeft_0" - android:title="@string/ir_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteIRRight_0" - android:title="@string/ir_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteIRForward_0" - android:title="@string/ir_forward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteIRBackward_0" - android:title="@string/ir_backward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteSwingUp_0" - android:title="@string/swing_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteSwingDown_0" - android:title="@string/swing_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteSwingLeft_0" - android:title="@string/swing_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteSwingRight_0" - android:title="@string/swing_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteTiltForward_0" - android:title="@string/tilt_forward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteTiltBackward_0" - android:title="@string/tilt_backward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteTiltLeft_0" - android:title="@string/tilt_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteTiltRight_0" - android:title="@string/tilt_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteShakeX_0" - android:title="@string/shake_x"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteShakeY_0" - android:title="@string/shake_y"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote1" - android:key="WiimoteShakeZ_0" - android:title="@string/shake_z"/> - </PreferenceScreen> - <PreferenceScreen - android:key="wiimote_bindings_control_1" - android:title="@string/wiimote_1"> - - <CheckBoxPreference - android:key="enableWiimote2" - android:title="@string/enable_wiimote"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteInputA_1" - android:title="@string/button_a"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteInputB_1" - android:title="@string/button_b"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteInputOne_1" - android:title="@string/button_one"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteInputTwo_1" - android:title="@string/button_two"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteInputPlus_1" - android:title="@string/button_plus"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteInputMinus_1" - android:title="@string/button_minus"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteInputHome_1" - android:title="@string/button_home"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteDPadUp_1" - android:title="@string/dpad_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteDPadDown_1" - android:title="@string/dpad_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteDPadLeft_1" - android:title="@string/dpad_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteDPadRight_1" - android:title="@string/dpad_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteIRUp_1" - android:title="@string/ir_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteIRDown_1" - android:title="@string/ir_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteIRLeft_1" - android:title="@string/ir_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteIRRight_1" - android:title="@string/ir_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteIRForward_1" - android:title="@string/ir_forward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteIRBackward_1" - android:title="@string/ir_backward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteSwingUp_1" - android:title="@string/swing_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteSwingDown_1" - android:title="@string/swing_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteSwingLeft_1" - android:title="@string/swing_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteSwingRight_1" - android:title="@string/swing_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteTiltForward_1" - android:title="@string/tilt_forward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteTiltBackward_1" - android:title="@string/tilt_backward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteTiltLeft_1" - android:title="@string/tilt_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteTiltRight_1" - android:title="@string/tilt_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteShakeX_1" - android:title="@string/shake_x"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteShakeY_1" - android:title="@string/shake_y"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote2" - android:key="WiimoteShakeZ_1" - android:title="@string/shake_z"/> - </PreferenceScreen> - <PreferenceScreen - android:key="wiimote_bindings_control_2" - android:title="@string/wiimote_2"> - - <CheckBoxPreference - android:key="enableWiimote3" - android:title="@string/enable_wiimote"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteInputA_2" - android:title="@string/button_a"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteInputB_2" - android:title="@string/button_b"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteInputOne_2" - android:title="@string/button_one"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteInputTwo_2" - android:title="@string/button_two"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteInputPlus_2" - android:title="@string/button_plus"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteInputMinus_2" - android:title="@string/button_minus"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteInputHome_2" - android:title="@string/button_home"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteDPadUp_2" - android:title="@string/dpad_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteDPadDown_2" - android:title="@string/dpad_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteDPadLeft_2" - android:title="@string/dpad_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteDPadRight_2" - android:title="@string/dpad_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteIRUp_2" - android:title="@string/ir_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteIRDown_2" - android:title="@string/ir_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteIRLeft_2" - android:title="@string/ir_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteIRRight_2" - android:title="@string/ir_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteIRForward_2" - android:title="@string/ir_forward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteIRBackward_2" - android:title="@string/ir_backward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteSwingUp_2" - android:title="@string/swing_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteSwingDown_2" - android:title="@string/swing_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteSwingLeft_2" - android:title="@string/swing_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteSwingRight_2" - android:title="@string/swing_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteTiltForward_2" - android:title="@string/tilt_forward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteTiltBackward_2" - android:title="@string/tilt_backward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteTiltLeft_2" - android:title="@string/tilt_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteTiltRight_2" - android:title="@string/tilt_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteShakeX_2" - android:title="@string/shake_x"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteShakeY_2" - android:title="@string/shake_y"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote3" - android:key="WiimoteShakeZ_2" - android:title="@string/shake_z"/> - </PreferenceScreen> - <PreferenceScreen - android:key="wiimote_bindings_control_3" - android:title="@string/wiimote_3"> - - <CheckBoxPreference - android:key="enableWiimote4" - android:title="@string/enable_wiimote"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteInputA_3" - android:title="@string/button_a"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteInputB_3" - android:title="@string/button_b"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteInputOne_3" - android:title="@string/button_one"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteInputTwo_3" - android:title="@string/button_two"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteInputPlus_3" - android:title="@string/button_plus"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteInputMinus_3" - android:title="@string/button_minus"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteInputHome_3" - android:title="@string/button_home"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteDPadUp_3" - android:title="@string/dpad_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteDPadDown_3" - android:title="@string/dpad_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteDPadLeft_3" - android:title="@string/dpad_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteDPadRight_3" - android:title="@string/dpad_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteIRUp_3" - android:title="@string/ir_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteIRDown_3" - android:title="@string/ir_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteIRLeft_3" - android:title="@string/ir_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteIRRight_3" - android:title="@string/ir_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteIRForward_3" - android:title="@string/ir_forward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteIRBackward_3" - android:title="@string/ir_backward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteSwingUp_3" - android:title="@string/swing_up"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteSwingDown_3" - android:title="@string/swing_down"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteSwingLeft_3" - android:title="@string/swing_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteSwingRight_3" - android:title="@string/swing_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteTiltForward_3" - android:title="@string/tilt_forward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteTiltBackward_3" - android:title="@string/tilt_backward"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteTiltLeft_3" - android:title="@string/tilt_left"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteTiltRight_3" - android:title="@string/tilt_right"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteShakeX_3" - android:title="@string/shake_x"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteShakeY_3" - android:title="@string/shake_y"/> - - <org.dolphinemu.dolphinemu.utils.InputBindingPreference - android:dependency="enableWiimote4" - android:key="WiimoteShakeZ_3" - android:title="@string/shake_z"/> - </PreferenceScreen> - </PreferenceScreen> --> -</PreferenceScreen>
\ No newline at end of file diff --git a/Source/Android/app/src/main/res/xml/preferences.xml b/Source/Android/app/src/main/res/xml/preferences.xml index a05cc7c14d..7e6a9f09ce 100644 --- a/Source/Android/app/src/main/res/xml/preferences.xml +++ b/Source/Android/app/src/main/res/xml/preferences.xml @@ -59,11 +59,9 @@ <PreferenceScreen android:key="gamecube_bindings" android:title="@string/gamecube_bindings"> - <PreferenceScreen android:key="gamecube_bindings_control_0" android:title="@string/controller_0"> - <CheckBoxPreference android:key="enableController1" android:title="@string/enable_controller"/> @@ -71,109 +69,126 @@ <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="InputA_0" + android:summary="%s" android:title="@string/button_a"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="InputB_0" + android:summary="%s" android:title="@string/button_b"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="InputX_0" + android:summary="%s" android:title="@string/button_x"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="InputY_0" + android:summary="%s" android:title="@string/button_y"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="InputZ_0" + android:summary="%s" android:title="@string/button_z"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="InputStart_0" + android:summary="%s" android:title="@string/button_start"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="DPadUp_0" + android:summary="%s" android:title="@string/dpad_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="DPadDown_0" + android:summary="%s" android:title="@string/dpad_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="DPadLeft_0" + android:summary="%s" android:title="@string/dpad_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="DPadRight_0" + android:summary="%s" android:title="@string/dpad_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="MainUp_0" + android:summary="%s" android:title="@string/main_stick_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="MainDown_0" + android:summary="%s" android:title="@string/main_stick_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="MainLeft_0" + android:summary="%s" android:title="@string/main_stick_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="MainRight_0" + android:summary="%s" android:title="@string/main_stick_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="CStickUp_0" + android:summary="%s" android:title="@string/c_stick_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="CStickDown_0" + android:summary="%s" android:title="@string/c_stick_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="CStickLeft_0" + android:summary="%s" android:title="@string/c_stick_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="CStickRight_0" + android:summary="%s" android:title="@string/c_stick_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="InputL_0" + android:summary="%s" android:title="@string/trigger_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController1" android:key="InputR_0" + android:summary="%s" android:title="@string/trigger_right"/> - </PreferenceScreen> - <PreferenceScreen android:key="gamecube_bindings_control_1" android:title="@string/controller_1"> - <CheckBoxPreference android:key="enableController2" android:title="@string/enable_controller"/> @@ -181,105 +196,123 @@ <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="InputA_1" + android:summary="%s" android:title="@string/button_a"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="InputB_1" + android:summary="%s" android:title="@string/button_b"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="InputX_1" + android:summary="%s" android:title="@string/button_x"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="InputY_1" + android:summary="%s" android:title="@string/button_y"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="InputZ_1" + android:summary="%s" android:title="@string/button_z"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="InputStart_1" + android:summary="%s" android:title="@string/button_start"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="DPadUp_1" + android:summary="%s" android:title="@string/dpad_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="DPadDown_1" + android:summary="%s" android:title="@string/dpad_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="DPadLeft_1" + android:summary="%s" android:title="@string/dpad_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="DPadRight_1" + android:summary="%s" android:title="@string/dpad_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="MainUp_1" + android:summary="%s" android:title="@string/main_stick_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="MainDown_1" + android:summary="%s" android:title="@string/main_stick_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="MainLeft_1" + android:summary="%s" android:title="@string/main_stick_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="MainRight_1" + android:summary="%s" android:title="@string/main_stick_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="CStickUp_1" + android:summary="%s" android:title="@string/c_stick_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="CStickDown_1" + android:summary="%s" android:title="@string/c_stick_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="CStickLeft_1" + android:summary="%s" android:title="@string/c_stick_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="CStickRight_1" + android:summary="%s" android:title="@string/c_stick_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="InputL_1" + android:summary="%s" android:title="@string/trigger_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController2" android:key="InputR_1" + android:summary="%s" android:title="@string/trigger_right"/> - </PreferenceScreen> - <PreferenceScreen android:key="gamecube_bindings_control_2" android:title="@string/controller_2"> @@ -290,109 +323,126 @@ <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="InputA_2" + android:summary="%s" android:title="@string/button_a"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="InputB_2" + android:summary="%s" android:title="@string/button_b"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="InputX_2" + android:summary="%s" android:title="@string/button_x"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="InputY_2" + android:summary="%s" android:title="@string/button_y"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="InputZ_2" + android:summary="%s" android:title="@string/button_z"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="InputStart_2" + android:summary="%s" android:title="@string/button_start"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="DPadUp_2" + android:summary="%s" android:title="@string/dpad_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="DPadDown_2" + android:summary="%s" android:title="@string/dpad_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="DPadLeft_2" + android:summary="%s" android:title="@string/dpad_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="DPadRight_2" + android:summary="%s" android:title="@string/dpad_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="MainUp_2" + android:summary="%s" android:title="@string/main_stick_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="MainDown_2" + android:summary="%s" android:title="@string/main_stick_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="MainLeft_2" + android:summary="%s" android:title="@string/main_stick_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="MainRight_2" + android:summary="%s" android:title="@string/main_stick_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="CStickUp_2" + android:summary="%s" android:title="@string/c_stick_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="CStickDown_2" + android:summary="%s" android:title="@string/c_stick_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="CStickLeft_2" + android:summary="%s" android:title="@string/c_stick_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="CStickRight_2" + android:summary="%s" android:title="@string/c_stick_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="InputL_2" + android:summary="%s" android:title="@string/trigger_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController3" android:key="InputR_2" + android:summary="%s" android:title="@string/trigger_right"/> - </PreferenceScreen> - <PreferenceScreen android:key="gamecube_bindings_control_3" android:title="@string/controller_3"> - <CheckBoxPreference android:key="enableController4" android:title="@string/enable_controller"/> @@ -400,105 +450,123 @@ <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="InputA_3" + android:summary="%s" android:title="@string/button_a"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="InputB_3" + android:summary="%s" android:title="@string/button_b"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="InputX_3" + android:summary="%s" android:title="@string/button_x"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="InputY_3" + android:summary="%s" android:title="@string/button_y"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="InputZ_3" + android:summary="%s" android:title="@string/button_z"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="InputStart_3" + android:summary="%s" android:title="@string/button_start"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="DPadUp_3" + android:summary="%s" android:title="@string/dpad_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="DPadDown_3" + android:summary="%s" android:title="@string/dpad_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="DPadLeft_3" + android:summary="%s" android:title="@string/dpad_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="DPadRight_3" + android:summary="%s" android:title="@string/dpad_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="MainUp_3" + android:summary="%s" android:title="@string/main_stick_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="MainDown_3" + android:summary="%s" android:title="@string/main_stick_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="MainLeft_3" + android:summary="%s" android:title="@string/main_stick_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="MainRight_3" + android:summary="%s" android:title="@string/main_stick_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="CStickUp_3" + android:summary="%s" android:title="@string/c_stick_up"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="CStickDown_3" + android:summary="%s" android:title="@string/c_stick_down"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="CStickLeft_3" + android:summary="%s" android:title="@string/c_stick_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="CStickRight_3" + android:summary="%s" android:title="@string/c_stick_right"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="InputL_3" + android:summary="%s" android:title="@string/trigger_left"/> <org.dolphinemu.dolphinemu.utils.InputBindingPreference android:dependency="enableController4" android:key="InputR_3" + android:summary="%s" android:title="@string/trigger_right"/> - </PreferenceScreen> - </PreferenceScreen> </PreferenceCategory> diff --git a/Source/Android/app/src/main/res/xml/video_prefs.xml b/Source/Android/app/src/main/res/xml/video_prefs.xml deleted file mode 100644 index 57c02e5944..0000000000 --- a/Source/Android/app/src/main/res/xml/video_prefs.xml +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> - - <!-- Video Settings --> - - - <!-- Video Enhancements --> - <PreferenceScreen android:title="@string/enhancements"> - - <ListPreference - android:entries="@array/internalResolutionEntries" - android:entryValues="@array/internalResolutionValues" - android:key="internalResolution" - android:summary="@string/internal_resolution_descrip" - android:title="@string/internal_resolution"/> - - <ListPreference - android:entries="@array/FSAAEntries" - android:entryValues="@array/FSAAValues" - android:key="FSAA" - android:summary="@string/FSAA_descrip" - android:title="@string/FSAA"/> - - <ListPreference - android:entries="@array/anisotropicFilteringEntries" - android:entryValues="@array/anisotropicFilteringValues" - android:key="anisotropicFiltering" - android:summary="@string/anisotropic_filtering_descrip" - android:title="@string/anisotropic_filtering"/> - - <ListPreference - android:key="postProcessingShader" - android:summary="@string/postprocessing_shader_descrip" - android:title="@string/postprocessing_shader"/> - - <CheckBoxPreference - android:defaultValue="true" - android:key="scaledEFBCopy" - android:summary="@string/scaled_efb_copy_descrip" - android:title="@string/scaled_efb_copy"/> - - <CheckBoxPreference - android:defaultValue="false" - android:key="perPixelLighting" - android:summary="@string/per_pixel_lighting_descrip" - android:title="@string/per_pixel_lighting"/> - - <CheckBoxPreference - android:defaultValue="false" - android:key="forceTextureFiltering" - android:summary="@string/force_texture_filtering_descrip" - android:title="@string/force_texture_filtering"/> - - <CheckBoxPreference - android:defaultValue="false" - android:key="disableFog" - android:summary="@string/disable_fog_descrip" - android:title="@string/disable_fog"/> - - <PreferenceScreen - android:title="@string/stereoscopy" - android:key="StereoscopyScreen" - android:summary="@string/stereoscopy_descrip"> - - <ListPreference - android:entries="@array/stereoscopyEntries" - android:entryValues="@array/stereoscopyValues" - android:key="stereoscopyMode" - android:summary="@string/stereoscopy_mode_descrip" - android:title="@string/stereoscopy_mode"/> - - <org.dolphinemu.dolphinemu.utils.SliderPreference - android:defaultValue="20" - android:key="stereoDepth" - android:max="100" - android:summary="@string/sterescopy_depth_descrip" - android:title="@string/sterescopy_depth" /> - - <org.dolphinemu.dolphinemu.utils.SliderPreference - android:defaultValue="20" - android:key="stereoConvergence" - android:max="500" - android:summary="@string/convergence_descrip" - android:title="@string/convergence" /> - - <CheckBoxPreference - android:defaultValue="false" - android:key="stereoSwapEyes" - android:summary="@string/swap_eyes_descrip" - android:title="@string/swap_eyes"/> - </PreferenceScreen> - </PreferenceScreen> - - <!-- Video Hacks --> - <PreferenceScreen android:title="@string/hacks"> - <PreferenceCategory android:title="@string/embedded_frame_buffer"> - - <CheckBoxPreference - android:defaultValue="false" - android:key="skipEFBAccess" - android:summary="@string/skip_efb_access_descrip" - android:title="@string/skip_efb_access"/> - - <CheckBoxPreference - android:defaultValue="true" - android:key="ignoreFormatChanges" - android:summary="@string/ignore_format_changes_descrip" - android:title="@string/ignore_format_changes"/> - - <ListPreference - android:defaultValue="Texture" - android:entries="@array/efbCopyMethodEntries" - android:entryValues="@array/efbCopyMethodValues" - android:key="efbCopyMethod" - android:summary="@string/efb_copy_method_descrip" - android:title="@string/efb_copy_method"/> - - </PreferenceCategory> - - <!-- Texture Cache --> - <PreferenceCategory android:title="@string/texture_cache"> - <ListPreference - android:defaultValue="Low" - android:entries="@array/textureCacheAccuracyEntries" - android:entryValues="@array/textureCacheAccuracyValues" - android:key="textureCacheAccuracy" - android:summary="@string/texture_cache_accuracy_descrip" - android:title="@string/texture_cache_accuracy"/> - </PreferenceCategory> - - <!-- External Frame Buffer --> - <PreferenceCategory android:title="@string/external_frame_buffer"> - <ListPreference - android:defaultValue="Disabled" - android:entries="@array/externalFrameBufferEntries" - android:entryValues="@array/externalFrameBufferValues" - android:key="externalFrameBuffer" - android:summary="@string/external_frame_buffer_descrip" - android:title="@string/external_frame_buffer"/> - </PreferenceCategory> - - - <!-- Other Hacks --> - <PreferenceCategory android:title="@string/other"> - - <CheckBoxPreference - android:defaultValue="false" - android:key="disableDestinationAlpha" - android:summary="@string/disable_destination_alpha_descrip" - android:title="@string/disable_destination_alpha"/> - - <CheckBoxPreference - android:defaultValue="true" - android:key="fastDepthCalculation" - android:summary="@string/fast_depth_calculation_descrip" - android:title="@string/fast_depth_calculation"/> - - <ListPreference - android:defaultValue="0" - android:entries="@array/aspectRatioEntries" - android:entryValues="@array/aspectRatioValues" - android:key="aspectRatio" - android:summary="@string/aspect_ratio_descrip" - android:title="@string/aspect_ratio"/> - - </PreferenceCategory> - </PreferenceScreen> - - <org.dolphinemu.dolphinemu.settings.custom.UpdatingListPreference - android:key="gpuPref" - android:summary="@string/video_backend_desc" - android:title="@string/video_backend" /> - - <CheckBoxPreference - android:key="showFPS" - android:summary="@string/show_fps_descrip" - android:title="@string/show_fps"/> -</PreferenceScreen>
\ No newline at end of file |