From a78dca5fb08d7c0f18d3d43d5b3b485549a5a8ce Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Sat, 17 Sep 2022 14:16:45 +0200
Subject: [PATCH] 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.
---
 .../features/settings/ui/SettingsFragmentPresenter.java     | 6 ++++--
 Source/Android/app/src/main/res/values/strings.xml          | 2 +-
 2 files changed, 5 insertions(+), 3 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)
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 @@
     <string name="wiimote_extension_3">Wii Remote Extension 4</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_input">Motion Input</string>
     <string name="wiimote_extensions">Extension</string>