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

Merge pull request #10360 from JosJuice/android-div-6 

Android: Don't divide SI device by 6
This commit is contained in:
Mai M 2022-01-13 07:41:08 -05:00 committed by GitHub
parent e4372a317d 9f3ed1f9f3
commit 7ebc689b57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java
View File

@ -140,7 +140,7 @@ public final class SettingsActivityPresenter
if (value != 0) // Not disabled if (value != 0) // Not disabled
{ {
Bundle bundle = new Bundle(); 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); mView.showSettingsFragment(key, bundle, true, mGameId);
} }
} }

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

@ -833,7 +833,7 @@ public final class SettingsFragmentPresenter
private void addGcPadSubSettings(ArrayList<SettingsItem> sl, int gcPadNumber, int gcPadType) 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 HeaderSetting(mContext, R.string.generic_buttons, 0));
sl.add(new InputBindingSetting(mContext, Settings.FILE_DOLPHIN, Settings.SECTION_BINDINGS, 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, SettingsFile.KEY_EMU_RUMBLE + gcPadNumber, R.string.emulation_control_rumble,
mGameID)); mGameID));
} }
else // Adapter else if (gcPadType == 12) // Adapter
{ {
LegacyBooleanSetting rumble = new LegacyBooleanSetting(Settings.FILE_DOLPHIN, LegacyBooleanSetting rumble = new LegacyBooleanSetting(Settings.FILE_DOLPHIN,
Settings.SECTION_INI_CORE, SettingsFile.KEY_GCADAPTER_RUMBLE + gcPadNumber, false); Settings.SECTION_INI_CORE, SettingsFile.KEY_GCADAPTER_RUMBLE + gcPadNumber, false);