diff options
| author | Mai M <mathew1800@gmail.com> | 2022-01-13 07:41:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 07:41:08 -0500 |
| commit | 7ebc689b57f508b456bc43907977e6e0015a275d (patch) | |
| tree | d3bfc500d869ecdee524ba5247f480e55e62db41 /Source/Android/app/src/main/java | |
| parent | e4372a317dbc6bd5ec509ee43e2e51f774193c9c (diff) | |
| parent | 9f3ed1f9f333838a803697cf1f26acc474ae3255 (diff) | |
Merge pull request #10360 from JosJuice/android-div-6
Android: Don't divide SI device by 6
Diffstat (limited to 'Source/Android/app/src/main/java')
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java index 8dbf415973..78f3a78fd6 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java @@ -140,7 +140,7 @@ public final class SettingsActivityPresenter if (value != 0) // Not disabled { Bundle bundle = new Bundle(); - bundle.putInt(SettingsFragmentPresenter.ARG_CONTROLLER_TYPE, value / 6); + bundle.putInt(SettingsFragmentPresenter.ARG_CONTROLLER_TYPE, value); mView.showSettingsFragment(key, bundle, true, mGameId); } } 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 5655a67ea8..8943930e5e 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 @@ -833,7 +833,7 @@ public final class SettingsFragmentPresenter private void addGcPadSubSettings(ArrayList<SettingsItem> sl, int gcPadNumber, int gcPadType) { - if (gcPadType == 1) // Emulated + if (gcPadType == 6) // Emulated { sl.add(new HeaderSetting(mContext, R.string.generic_buttons, 0)); sl.add(new InputBindingSetting(mContext, Settings.FILE_DOLPHIN, Settings.SECTION_BINDINGS, @@ -892,7 +892,7 @@ public final class SettingsFragmentPresenter SettingsFile.KEY_EMU_RUMBLE + gcPadNumber, R.string.emulation_control_rumble, mGameID)); } - else // Adapter + else if (gcPadType == 12) // Adapter { LegacyBooleanSetting rumble = new LegacyBooleanSetting(Settings.FILE_DOLPHIN, Settings.SECTION_INI_CORE, SettingsFile.KEY_GCADAPTER_RUMBLE + gcPadNumber, false); |