piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 13:27:45 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8093 from JosJuice/android-runtime-extension-change

Browse Source 
Android: Support changing Wii Remote extension while emulating
This commit is contained in:
Connor McLaughlin 2019-05-12 15:22:07 +10:00 committed by GitHub
commit 1d5dd5db91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View File

@ -821,23 +821,18 @@ public final class EmulationActivity extends AppCompatActivity
(dialog, indexSelected) -> (dialog, indexSelected) ->
{ {
editor.putInt("wiiController", indexSelected); editor.putInt("wiiController", indexSelected);
NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension", NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension",
getResources().getStringArray(R.array.controllersValues)[indexSelected]); getResources().getStringArray(R.array.controllersValues)[indexSelected]);
NativeLibrary.ReloadWiimoteConfig();
}); });
builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) -> builder.setPositiveButton(getString(R.string.ok), (dialogInterface, i) ->
{ {
editor.apply(); editor.apply();
mEmulationFragment.refreshInputOverlay(); mEmulationFragment.refreshInputOverlay();
Toast.makeText(getApplication(), R.string.emulation_controller_changed, Toast.LENGTH_SHORT)
.show();
}); });
AlertDialog alertDialog = builder.create(); AlertDialog alertDialog = builder.create();
alertDialog.show(); alertDialog.show();
} }
private void setIRSensitivity() private void setIRSensitivity()

1
Source/Android/app/src/main/res/values/strings.xml
View File

@ -298,7 +298,6 @@
<string name="emulation_control_joystick_rel_center">Relative Stick Center</string> <string name="emulation_control_joystick_rel_center">Relative Stick Center</string>
<string name="emulation_control_rumble">Rumble</string> <string name="emulation_control_rumble">Rumble</string>
<string name="emulation_choose_controller">Choose Controller</string> <string name="emulation_choose_controller">Choose Controller</string>
<string name="emulation_controller_changed">You may have to reload the game after changing extensions.</string>
<string name="emulation_touch_button_help">Swipe down from the top of the screen to access the menu.</string> <string name="emulation_touch_button_help">Swipe down from the top of the screen to access the menu.</string>
<string name="emulation_touch_overlay_reset">Reset Overlay</string> <string name="emulation_touch_overlay_reset">Reset Overlay</string>
<string name="emulation_ir_group">Touch IR Pointer</string> <string name="emulation_ir_group">Touch IR Pointer</string>