ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Update rumble settings for use in game profiles

This commit is contained in:
zackhow 2018-10-28 20:30:32 -04:00
parent 471485071d
commit f46157793f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/RumbleBindingSetting.java
View File

@ -15,9 +15,10 @@ import org.dolphinemu.dolphinemu.utils.Rumble;
public class RumbleBindingSetting extends InputBindingSetting public class RumbleBindingSetting extends InputBindingSetting
{ {
public RumbleBindingSetting(String key, String section, int titleId, Setting setting) public RumbleBindingSetting(String key, String section, int titleId, Setting setting,
String gameId)
{ {
super(key, section, titleId, setting); super(key, section, titleId, setting, gameId);
} }
@Override @Override

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

@ -712,7 +712,7 @@ public final class SettingsFragmentPresenter
sl.add(new HeaderSetting(null, null, R.string.emulation_control_rumble, 0)); sl.add(new HeaderSetting(null, null, R.string.emulation_control_rumble, 0));
sl.add(new RumbleBindingSetting(SettingsFile.KEY_EMU_RUMBLE + gcPadNumber, sl.add(new RumbleBindingSetting(SettingsFile.KEY_EMU_RUMBLE + gcPadNumber,
Settings.SECTION_BINDINGS, R.string.emulation_control_rumble, gcEmuRumble)); Settings.SECTION_BINDINGS, R.string.emulation_control_rumble, gcEmuRumble, mGameID));
} }
else // Adapter else // Adapter
{ {
@ -900,7 +900,7 @@ public final class SettingsFragmentPresenter
sl.add(new HeaderSetting(null, null, R.string.emulation_control_rumble, 0)); sl.add(new HeaderSetting(null, null, R.string.emulation_control_rumble, 0));
sl.add(new RumbleBindingSetting(SettingsFile.KEY_EMU_RUMBLE + wiimoteNumber, sl.add(new RumbleBindingSetting(SettingsFile.KEY_EMU_RUMBLE + wiimoteNumber,
Settings.SECTION_BINDINGS, R.string.emulation_control_rumble, wiiEmuRumble)); Settings.SECTION_BINDINGS, R.string.emulation_control_rumble, wiiEmuRumble, mGameID));
} }
private void addExtensionTypeSettings(ArrayList<SettingsItem> sl, int wiimoteNumber, private void addExtensionTypeSettings(ArrayList<SettingsItem> sl, int wiimoteNumber,