diff options
| author | zackhow <zackhow@gmail.com> | 2018-10-28 20:30:32 -0400 |
|---|---|---|
| committer | zackhow <zackhow@gmail.com> | 2018-10-28 20:44:41 -0400 |
| commit | f46157793faa9c1352b9df08c3667bbafdf2f71e (patch) | |
| tree | 2ba2ec732329485c14fd8a3225cbc3d1f63e0a96 /Source/Android/app/src/main/java/org | |
| parent | 471485071d7265ad57bbddd6fa4b052d463ffb4e (diff) | |
Android: Update rumble settings for use in game profiles
Diffstat (limited to 'Source/Android/app/src/main/java/org')
2 files changed, 5 insertions, 4 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/RumbleBindingSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/RumbleBindingSetting.java index 8dde9825d5..175d444d5f 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/RumbleBindingSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/RumbleBindingSetting.java @@ -15,9 +15,10 @@ import org.dolphinemu.dolphinemu.utils.Rumble; 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 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 6359c340e2..f27596228f 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 @@ -712,7 +712,7 @@ public final class SettingsFragmentPresenter sl.add(new HeaderSetting(null, null, R.string.emulation_control_rumble, 0)); 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 { @@ -900,7 +900,7 @@ public final class SettingsFragmentPresenter sl.add(new HeaderSetting(null, null, R.string.emulation_control_rumble, 0)); 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, |