summaryrefslogtreecommitdiff
path: root/Source/Android/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2013-11-19 19:28:10 -0500
committerLioncash <mathew1800@gmail.com>2013-11-19 19:28:10 -0500
commit42f8562e5c7acfb6b697672f419f0f28366a5261 (patch)
treea3d7c40ca8ba2697b74a9ce1b22acfaa245b09e3 /Source/Android/src
parent7e544d8996d1365d270b57527583efcdb14b4e76 (diff)
[Android] Basic Wiimote binding settings now implemented.
Diffstat (limited to 'Source/Android/src')
-rw-r--r--Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java24
1 files changed, 21 insertions, 3 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java
index 3544010604..b71baba565 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java
@@ -36,7 +36,7 @@ public final class InputConfigFragment extends PreferenceFragment
// Set the summary messages of the preferences to whatever binding
// is currently set within the Dolphin config.
- final String[] keys =
+ final String[] gamecubeKeys =
{
"InputA", "InputB", "InputX", "InputY", "InputZ", "InputStart",
"DPadUp", "DPadDown", "DPadLeft", "DPadRight",
@@ -45,10 +45,28 @@ public final class InputConfigFragment extends PreferenceFragment
"InputL", "InputR"
};
- // Loop through the keys for all 4 GameCube controllers.
+ 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 = 1; i <= 4; i++)
{
- for (String key : keys)
+ // 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);