diff options
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/res/values-ja/strings.xml | 31 | ||||
| -rw-r--r-- | Source/Android/res/values/strings.xml | 39 | ||||
| -rw-r--r-- | Source/Android/res/xml/input_prefs.xml | 600 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/input/InputConfigFragment.java | 24 |
4 files changed, 685 insertions, 9 deletions
diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml index 2415e704bf..5b71679efd 100644 --- a/Source/Android/res/values-ja/strings.xml +++ b/Source/Android/res/values-ja/strings.xml @@ -45,14 +45,20 @@ <string name="input_settings">入力</string> <string name="input_overlay_layout">入力オーバーレイレイアウト</string> <string name="input_overlay_layout_desc">入力オーバーレイのためのボタンのレイアウト。</string> - <string name="gamecube_bindings">ゲームキューブの入力バインディング</string> + <string name="gamecube_bindings">ゲームキューブコントローラの入力バインディング</string> <string name="controller_1">コントローラ1</string> <string name="controller_2">コントローラ2</string> <string name="controller_3">コントローラ3</string> <string name="controller_4">コントローラ4</string> <string name="enable_controller">コントローラを有効</string> + <string name="wiimote_bindings">Wiiリモコンの入力バインディング</string> + <string name="wiimote_1">Wiiリモコン1</string> + <string name="wiimote_2">Wiiリモコン2</string> + <string name="wiimote_3">Wiiリモコン3</string> + <string name="wiimote_4">Wiiリモコン4</string> <string name="input_binding">入力バインディング</string> <string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string> + <!-- Gamecube buttons (May be shared with Wiimote stuff too) --> <string name="button_a">Aボタン</string> <string name="button_b">Bボタン</string> <string name="button_start">スタートボタン</string> @@ -73,6 +79,29 @@ <string name="c_stick_right">C-スティック: →</string> <string name="trigger_left">左のトリガー</string> <string name="trigger_right">右のトリガー</string> + <!-- Wiimote (+ extension) only buttons --> + <string name="button_one">ボタン1</string> + <string name="button_two">ボタン2</string> + <string name="button_plus">ボタン+</string> + <string name="button_minus">ボタン-</string> + <string name="button_home">ホームボタン</string> + <string name="ir_up">IR ↑</string> + <string name="ir_down">IR ↓</string> + <string name="ir_left">IR ←</string> + <string name="ir_right">IR →</string> + <string name="ir_forward">IR前方</string> + <string name="ir_backward">IR後方</string> + <string name="swing_up">スイング ↑</string> + <string name="swing_down">スイング ↓</string> + <string name="swing_left">スイング ←</string> + <string name="swing_right">スイング →</string> + <string name="tilt_forward">前方を傾</string> + <string name="tilt_backward">後方を傾</string> + <string name="tilt_left">左を傾</string> + <string name="tilt_right">右を傾</string> + <string name="shake_x">Xを振る</string> + <string name="shake_y">Yを振る</string> + <string name="shake_z">Zを振る</string> <!-- CPU Preference Fragment --> <string name="interpreter">Interpreter</string> diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml index ada8417fbf..86cba61763 100644 --- a/Source/Android/res/values/strings.xml +++ b/Source/Android/res/values/strings.xml @@ -45,14 +45,21 @@ <string name="input_settings">Input</string> <string name="input_overlay_layout">Input Overlay Layout</string> <string name="input_overlay_layout_desc">Button layout for the input overlay.</string> - <string name="gamecube_bindings">Gamecube Input Bindings</string> + <string name="gamecube_bindings">Gamecube Controller Bindings</string> <string name="controller_1">Controller 1</string> <string name="controller_2">Controller 2</string> <string name="controller_3">Controller 3</string> <string name="controller_4">Controller 4</string> <string name="enable_controller">Enable controller</string> + <string name="wiimote_bindings">Wiimote Bindings</string> + <string name="wiimote_1">Wiimote 1</string> + <string name="wiimote_2">Wiimote 2</string> + <string name="wiimote_3">Wiimote 3</string> + <string name="wiimote_4">Wiimote 4</string> + <string name="enable_wiimote">Enable Wiimote</string> <string name="input_binding">Input Binding</string> <string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string> + <!-- Gamecube buttons (May be shared with Wiimote stuff too) --> <string name="button_a">Button A</string> <string name="button_b">Button B</string> <string name="button_start">Button Start</string> @@ -73,6 +80,29 @@ <string name="c_stick_right">C Stick Right</string> <string name="trigger_left">Trigger L</string> <string name="trigger_right">Trigger R</string> + <!-- Wiimote (+ extension) only buttons --> + <string name="button_one">Button 1</string> + <string name="button_two">Button 2</string> + <string name="button_plus">Button +</string> + <string name="button_minus">Button -</string> + <string name="button_home">Button Home</string> + <string name="ir_up">IR Up</string> + <string name="ir_down">IR Down</string> + <string name="ir_left">IR Left</string> + <string name="ir_right">IR Right</string> + <string name="ir_forward">IR Forward</string> + <string name="ir_backward">IR Backward</string> + <string name="swing_up">Swing Up</string> + <string name="swing_down">Swing Down</string> + <string name="swing_left">Swing Left</string> + <string name="swing_right">Swing Right</string> + <string name="tilt_forward">Tilt Forward</string> + <string name="tilt_backward">Tilt Backward</string> + <string name="tilt_left">Tilt Left</string> + <string name="tilt_right">Tilt Right</string> + <string name="shake_x">Shake X</string> + <string name="shake_y">Shake Y</string> + <string name="shake_z">Shake Z</string> <!-- CPU Preference Fragment --> <string name="interpreter">Interpreter</string> @@ -96,7 +126,7 @@ <string name="video_backend_desc">%s</string> <string name="show_fps">Show FPS</string> <string name="show_fps_descrip">Show the number of frames rendered per second as a measure of emulation speed.</string> - + <string name="enhancements">Enhancements</string> <string name="internal_resolution">Internal Resolution</string> <string name="internal_resolution_descrip">Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games.</string> @@ -112,7 +142,7 @@ <string name="force_texture_filtering_descrip">Force texture filtering even if the emulated game explicitly disabled it. Improves texture quality slightly but causes glitches in some games.</string> <string name="disable_fog">Disable Fog</string> <string name="disable_fog_descrip">Makes distant objects more visible by removing fog, thus increasing the overall detail. Disabling fog will break some games which rely on proper fog emulation.</string> - + <string name="hacks">Hacks</string> <string name="embedded_frame_buffer">Embedded Frame Buffer</string> <string name="skip_efb_access">Skip EFB Access from CPU</string> @@ -140,13 +170,12 @@ <string name="disable_destination_alpha_descrip">Disables emulation of a hardware feature called destination alpha, which is used in many games for various effects.</string> <string name="fast_depth_calculation">Fast Depth Calculation</string> <string name="fast_depth_calculation_descrip">Uses a less accurate algorithm to calculate depth values.</string> - + <!-- Miscellaneous --> <string name="yes">Yes</string> <string name="no">No</string> <string name="cancel">Cancel</string> <string name="disabled">Disabled</string> <string name="other">Other</string> - </resources> diff --git a/Source/Android/res/xml/input_prefs.xml b/Source/Android/res/xml/input_prefs.xml index 439d80ebe3..22cf0117e9 100644 --- a/Source/Android/res/xml/input_prefs.xml +++ b/Source/Android/res/xml/input_prefs.xml @@ -7,6 +7,7 @@ android:summary="@string/input_overlay_layout_desc" android:title="@string/input_overlay_layout"/> + <!-- Gamecube controller bindings --> <PreferenceScreen android:key="gamecube_bindings" android:title="@string/gamecube_bindings"> @@ -439,4 +440,603 @@ 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_1" + android:title="@string/wiimote_1"> + + <CheckBoxPreference + android:key="enableWiimote1" + android:title="@string/enable_wiimote"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteInputA_1" + android:title="@string/button_a"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteInputB_1" + android:title="@string/button_b"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteInputOne_1" + android:title="@string/button_one"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteInputTwo_1" + android:title="@string/button_two"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteInputPlus_1" + android:title="@string/button_plus"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteInputMinus_1" + android:title="@string/button_minus"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteInputHome_1" + android:title="@string/button_home"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteDPadUp_1" + android:title="@string/dpad_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteDPadDown_1" + android:title="@string/dpad_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteDPadLeft_1" + android:title="@string/dpad_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteDPadRight_1" + android:title="@string/dpad_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteIRUp_1" + android:title="@string/ir_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteIRDown_1" + android:title="@string/ir_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteIRLeft_1" + android:title="@string/ir_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteIRRight_1" + android:title="@string/ir_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteIRForward_1" + android:title="@string/ir_forward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteIRBackward_1" + android:title="@string/ir_backward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteSwingUp_1" + android:title="@string/swing_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteSwingDown_1" + android:title="@string/swing_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteSwingLeft_1" + android:title="@string/swing_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteSwingRight_1" + android:title="@string/swing_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteTiltForward_1" + android:title="@string/tilt_forward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteTiltBackward_1" + android:title="@string/tilt_backward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteTiltLeft_1" + android:title="@string/tilt_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteTiltRight_1" + android:title="@string/tilt_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteShakeX_1" + android:title="@string/shake_x"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + android:key="WiimoteShakeY_1" + android:title="@string/shake_y"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote1" + 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="enableWiimote2" + android:title="@string/enable_wiimote"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteInputA_2" + android:title="@string/button_a"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteInputB_2" + android:title="@string/button_b"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteInputOne_2" + android:title="@string/button_one"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteInputTwo_2" + android:title="@string/button_two"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteInputPlus_2" + android:title="@string/button_plus"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteInputMinus_2" + android:title="@string/button_minus"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteInputHome_2" + android:title="@string/button_home"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteDPadUp_2" + android:title="@string/dpad_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteDPadDown_2" + android:title="@string/dpad_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteDPadLeft_2" + android:title="@string/dpad_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteDPadRight_2" + android:title="@string/dpad_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteIRUp_2" + android:title="@string/ir_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteIRDown_2" + android:title="@string/ir_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteIRLeft_2" + android:title="@string/ir_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteIRRight_2" + android:title="@string/ir_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteIRForward_2" + android:title="@string/ir_forward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteIRBackward_2" + android:title="@string/ir_backward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteSwingUp_2" + android:title="@string/swing_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteSwingDown_2" + android:title="@string/swing_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteSwingLeft_2" + android:title="@string/swing_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteSwingRight_2" + android:title="@string/swing_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteTiltForward_2" + android:title="@string/tilt_forward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteTiltBackward_2" + android:title="@string/tilt_backward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteTiltLeft_2" + android:title="@string/tilt_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteTiltRight_2" + android:title="@string/tilt_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteShakeX_2" + android:title="@string/shake_x"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + android:key="WiimoteShakeY_2" + android:title="@string/shake_y"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote2" + 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="enableWiimote3" + android:title="@string/enable_wiimote"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteInputA_3" + android:title="@string/button_a"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteInputB_3" + android:title="@string/button_b"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteInputOne_3" + android:title="@string/button_one"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteInputTwo_3" + android:title="@string/button_two"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteInputPlus_3" + android:title="@string/button_plus"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteInputMinus_3" + android:title="@string/button_minus"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteInputHome_3" + android:title="@string/button_home"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteDPadUp_3" + android:title="@string/dpad_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteDPadDown_3" + android:title="@string/dpad_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteDPadLeft_3" + android:title="@string/dpad_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteDPadRight_3" + android:title="@string/dpad_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteIRUp_3" + android:title="@string/ir_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteIRDown_3" + android:title="@string/ir_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteIRLeft_3" + android:title="@string/ir_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteIRRight_3" + android:title="@string/ir_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteIRForward_3" + android:title="@string/ir_forward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteIRBackward_3" + android:title="@string/ir_backward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteSwingUp_3" + android:title="@string/swing_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteSwingDown_3" + android:title="@string/swing_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteSwingLeft_3" + android:title="@string/swing_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteSwingRight_3" + android:title="@string/swing_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteTiltForward_3" + android:title="@string/tilt_forward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteTiltBackward_3" + android:title="@string/tilt_backward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteTiltLeft_3" + android:title="@string/tilt_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteTiltRight_3" + android:title="@string/tilt_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteShakeX_3" + android:title="@string/shake_x"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteShakeY_3" + android:title="@string/shake_y"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote3" + android:key="WiimoteShakeZ_3" + android:title="@string/shake_z"/> + </PreferenceScreen> + <PreferenceScreen + android:key="wiimote_bindings_control_4" + android:title="@string/wiimote_4"> + + <CheckBoxPreference + android:key="enableWiimote4" + android:title="@string/enable_wiimote"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteInputA_4" + android:title="@string/button_a"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteInputB_4" + android:title="@string/button_b"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteInputOne_4" + android:title="@string/button_one"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteInputTwo_4" + android:title="@string/button_two"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteInputPlus_4" + android:title="@string/button_plus"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteInputMinus_4" + android:title="@string/button_minus"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteInputHome_4" + android:title="@string/button_home"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteDPadUp_4" + android:title="@string/dpad_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteDPadDown_4" + android:title="@string/dpad_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteDPadLeft_4" + android:title="@string/dpad_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteDPadRight_4" + android:title="@string/dpad_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteIRUp_4" + android:title="@string/ir_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteIRDown_4" + android:title="@string/ir_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteIRLeft_4" + android:title="@string/ir_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteIRRight_4" + android:title="@string/ir_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteIRForward_4" + android:title="@string/ir_forward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteIRBackward_4" + android:title="@string/ir_backward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteSwingUp_4" + android:title="@string/swing_up"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteSwingDown_4" + android:title="@string/swing_down"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteSwingLeft_4" + android:title="@string/swing_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteSwingRight_4" + android:title="@string/swing_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteTiltForward_4" + android:title="@string/tilt_forward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteTiltBackward_4" + android:title="@string/tilt_backward"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteTiltLeft_4" + android:title="@string/tilt_left"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteTiltRight_4" + android:title="@string/tilt_right"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteShakeX_4" + android:title="@string/shake_x"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteShakeY_4" + android:title="@string/shake_y"/> + + <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference + android:dependency="enableWiimote4" + android:key="WiimoteShakeZ_4" + android:title="@string/shake_z"/> + </PreferenceScreen> + </PreferenceScreen> </PreferenceScreen>
\ No newline at end of file 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); |