diff options
| author | JosJuice <josjuice@gmail.com> | 2022-09-17 14:16:45 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2023-03-03 22:28:24 +0100 |
| commit | a78dca5fb08d7c0f18d3d43d5b3b485549a5a8ce (patch) | |
| tree | f6595f327f9fafd275058ec7f7e584362d4432b3 /Source/Android/app/src/main/java | |
| parent | e7530a1cb91d9b49257fbfb75cb000757b212489 (diff) | |
Android: Move Sideways Wii Remote setting one submenu up
A slight departure from DolphinQt, but I think it makes sense, because
it will make the important Sideways Wii Remote setting easier to find.
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index 3f60937810..f731a3426f 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -1127,8 +1127,10 @@ public final class SettingsFragmentPresenter sl.add(new SubmenuSetting(mContext, R.string.wiimote_motion_input, 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), - Collections.singleton(ControlGroup.TYPE_ATTACHMENTS)); + new ArraySet<>(Arrays.asList(ControlGroup.TYPE_ATTACHMENTS, ControlGroup.TYPE_OTHER))); } private void addExtensionTypeSettings(ArrayList<SettingsItem> sl, int wiimoteNumber, @@ -1141,7 +1143,7 @@ public final class SettingsFragmentPresenter private void addWiimoteGeneralSubSettings(ArrayList<SettingsItem> sl, int 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) |