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 sl, int wiimoteNumber, @@ -1141,7 +1143,7 @@ public final class SettingsFragmentPresenter private void addWiimoteGeneralSubSettings(ArrayList 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 sl, int wiimoteNumber) diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index ea3942cdcb..4fd30b59fb 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -22,7 +22,7 @@ Wii Remote Extension 4 Wii Remote - General and Options + Buttons Motion Simulation Motion Input Extension