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

Android: Move Sideways Wii Remote setting one submenu up

Browse Source 
A slight departure from DolphinQt, but I think it makes sense, because
it will make the important Sideways Wii Remote setting easier to find.
This commit is contained in:
JosJuice 2022-09-17 14:16:45 +02:00
parent e7530a1cb9
commit a78dca5fb0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
View File

@ -1127,8 +1127,10 @@ public final class SettingsFragmentPresenter
sl.add(new SubmenuSetting(mContext, R.string.wiimote_motion_input, sl.add(new SubmenuSetting(mContext, R.string.wiimote_motion_input,
MenuTag.getWiimoteMotionInputMenuTag(wiimoteNumber))); MenuTag.getWiimoteMotionInputMenuTag(wiimoteNumber)));
// TYPE_OTHER is included here instead of in addWiimoteGeneralSubSettings so that touchscreen
// users won't have to dig into a submenu to find the Sideways Wii Remote setting
addControllerSettings(sl, EmulatedController.getWiimote(wiimoteNumber), addControllerSettings(sl, EmulatedController.getWiimote(wiimoteNumber),
Collections.singleton(ControlGroup.TYPE_ATTACHMENTS)); new ArraySet<>(Arrays.asList(ControlGroup.TYPE_ATTACHMENTS, ControlGroup.TYPE_OTHER)));
} }
private void addExtensionTypeSettings(ArrayList<SettingsItem> sl, int wiimoteNumber, private void addExtensionTypeSettings(ArrayList<SettingsItem> sl, int wiimoteNumber,
@ -1141,7 +1143,7 @@ public final class SettingsFragmentPresenter
private void addWiimoteGeneralSubSettings(ArrayList<SettingsItem> sl, int wiimoteNumber) private void addWiimoteGeneralSubSettings(ArrayList<SettingsItem> sl, int wiimoteNumber)
{ {
addControllerSettings(sl, EmulatedController.getWiimote(wiimoteNumber), addControllerSettings(sl, EmulatedController.getWiimote(wiimoteNumber),
new ArraySet<>(Arrays.asList(ControlGroup.TYPE_BUTTONS, ControlGroup.TYPE_OTHER))); Collections.singleton(ControlGroup.TYPE_BUTTONS));
} }
private void addWiimoteMotionSimulationSubSettings(ArrayList<SettingsItem> sl, int wiimoteNumber) private void addWiimoteMotionSimulationSubSettings(ArrayList<SettingsItem> sl, int wiimoteNumber)

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

@ -22,7 +22,7 @@
<string name="wiimote_extension_3">Wii Remote Extension 4</string> <string name="wiimote_extension_3">Wii Remote Extension 4</string>
<string name="wiimote">Wii Remote</string> <string name="wiimote">Wii Remote</string>
<string name="wiimote_general">General and Options</string> <string name="wiimote_general">Buttons</string>
<string name="wiimote_motion_simulation">Motion Simulation</string> <string name="wiimote_motion_simulation">Motion Simulation</string>
<string name="wiimote_motion_input">Motion Input</string> <string name="wiimote_motion_input">Motion Input</string>
<string name="wiimote_extensions">Extension</string> <string name="wiimote_extensions">Extension</string>