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: Remove the in-emulation motion control options

Browse Source 
You can set this in the normal controller settings now.
This commit is contained in:
JosJuice 2022-06-26 14:44:50 +02:00
parent 9b9b6d97bc
commit ee2c7dc24b
4 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,9 +124,9 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
MENU_ACTION_LOAD_SLOT3, MENU_ACTION_LOAD_SLOT4, MENU_ACTION_LOAD_SLOT5,
MENU_ACTION_LOAD_SLOT6, MENU_ACTION_EXIT, MENU_ACTION_CHANGE_DISC,
MENU_ACTION_RESET_OVERLAY, MENU_SET_IR_RECENTER, MENU_SET_IR_MODE,
MENU_SET_IR_SENSITIVITY, MENU_ACTION_CHOOSE_DOUBLETAP, MENU_ACTION_MOTION_CONTROLS,
MENU_ACTION_PAUSE_EMULATION, MENU_ACTION_UNPAUSE_EMULATION, MENU_ACTION_OVERLAY_CONTROLS,
MENU_ACTION_SETTINGS, MENU_ACTION_SKYLANDERS})
MENU_SET_IR_SENSITIVITY, MENU_ACTION_CHOOSE_DOUBLETAP,
MENU_ACTION_PAUSE_EMULATION, MENU_ACTION_UNPAUSE_EMULATION,
MENU_ACTION_OVERLAY_CONTROLS, MENU_ACTION_SETTINGS, MENU_ACTION_SKYLANDERS})
public @interface MenuAction
{
}
@ -161,7 +161,6 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
public static final int MENU_SET_IR_MODE = 28;
public static final int MENU_SET_IR_SENSITIVITY = 29;
public static final int MENU_ACTION_CHOOSE_DOUBLETAP = 30;
public static final int MENU_ACTION_MOTION_CONTROLS = 31;
public static final int MENU_ACTION_PAUSE_EMULATION = 32;
public static final int MENU_ACTION_UNPAUSE_EMULATION = 33;
public static final int MENU_ACTION_OVERLAY_CONTROLS = 34;
@ -200,8 +199,6 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
EmulationActivity.MENU_SET_IR_SENSITIVITY);
buttonsActionsMap.append(R.id.menu_emulation_choose_doubletap,
EmulationActivity.MENU_ACTION_CHOOSE_DOUBLETAP);
buttonsActionsMap.append(R.id.menu_emulation_motion_controls,
EmulationActivity.MENU_ACTION_MOTION_CONTROLS);
}
public static void launch(FragmentActivity activity, String filePath, boolean riivolution)
@ -300,7 +297,6 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
public static void updateWiimoteNewIniPreferences(Context context)
{
updateWiimoteNewController(InputOverlay.getConfiguredControllerType(context), context);
updateWiimoteNewImuIr(IntSetting.MAIN_MOTION_CONTROLS.getIntGlobal());
}
private static void updateWiimoteNewController(int value, Context context)
@ -313,14 +309,6 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
wiimoteNewIni.save(wiimoteNewFile);
}
private static void updateWiimoteNewImuIr(int value)
{
File wiimoteNewFile = SettingsFile.getSettingsFile(Settings.FILE_WIIMOTE);
IniFile wiimoteNewIni = new IniFile(wiimoteNewFile);
wiimoteNewIni.setBoolean("Wiimote1", "IMUIR/Enabled", value != 1);
wiimoteNewIni.save(wiimoteNewFile);
}
@Override
protected void onCreate(Bundle savedInstanceState)
{
@ -806,10 +794,6 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
chooseDoubleTapButton();
break;
case MENU_ACTION_MOTION_CONTROLS:
showMotionControlsOptions();
break;
case MENU_ACTION_SETTINGS:
SettingsActivity.launch(this, MenuTag.SETTINGS);
break;
@ -1024,23 +1008,6 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
.show();
}
private void showMotionControlsOptions()
{
new MaterialAlertDialogBuilder(this)
.setTitle(R.string.emulation_motion_controls)
.setSingleChoiceItems(R.array.motionControlsEntries,
IntSetting.MAIN_MOTION_CONTROLS.getInt(mSettings),
(dialog, indexSelected) ->
{
IntSetting.MAIN_MOTION_CONTROLS.setInt(mSettings, indexSelected);
updateWiimoteNewImuIr(indexSelected);
NativeLibrary.ReloadWiimoteConfig();
})
.setPositiveButton(R.string.ok, (dialogInterface, i) -> dialogInterface.dismiss())
.show();
}
private void setIRMode()
{
new MaterialAlertDialogBuilder(this)

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java
View File

@ -41,7 +41,6 @@ public enum IntSetting implements AbstractIntSetting
MAIN_INTERFACE_THEME_MODE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID,
"InterfaceThemeMode", -1),
MAIN_LAST_PLATFORM_TAB(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "LastPlatformTab", 0),
MAIN_MOTION_CONTROLS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "MotionControls", 1),
MAIN_IR_MODE(Settings.FILE_DOLPHIN, Settings.SECTION_INI_ANDROID, "IRMode",
InputOverlayPointer.MODE_FOLLOW),

4
Source/Android/app/src/main/res/menu/menu_overlay_controls_wii.xml
View File

@ -25,10 +25,6 @@
android:id="@+id/menu_emulation_choose_controller"
android:title="@string/emulation_choose_controller"/>
<item
android:id="@+id/menu_emulation_motion_controls"
android:title="@string/emulation_motion_controls"/>
<item
android:id="@+id/menu_emulation_ir_group"
android:title="@string/emulation_ir_group">

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

@ -578,7 +578,6 @@ It can efficiently compress both junk data and encrypted Wii data.
<string name="emulation_ir_mode">IR Mode</string>
<string name="emulation_ir_sensitivity">IR Sensitivity</string>
<string name="emulation_choose_doubletap">Double tap button</string>
<string name="emulation_motion_controls">Motion Controls</string>
<!-- GC Adapter Menu-->
<string name="gc_adapter_rumble">Enable Vibration</string>