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 #7530 from zackhow/settings-fix 

Android: fix custom game control ui
This commit is contained in:
Pierre Bourdon 2018-10-29 04:18:54 +01:00 committed by GitHub
parent 2b905eb06a e02b80cfa8
commit 580c26dc1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 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/model/view/InputBindingSetting.java
View File

@ -75,7 +75,7 @@ public class InputBindingSetting extends SettingsItem
preferences = preferences =
PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext()); PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext());
SharedPreferences.Editor editor = preferences.edit(); SharedPreferences.Editor editor = preferences.edit();
editor.putString(getKey(), ui); editor.putString(getKey() + gameId, ui);
editor.apply(); editor.apply();
if (getSetting() == null) if (getSetting() == null)

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/RumbleBindingViewHolder.java
View File

@ -42,7 +42,8 @@ public class RumbleBindingViewHolder extends SettingViewHolder
mItem = (RumbleBindingSetting) item; mItem = (RumbleBindingSetting) item;
mTextSettingName.setText(item.getNameId()); mTextSettingName.setText(item.getNameId());
mTextSettingDescription.setText(sharedPreferences.getString(mItem.getKey(), "")); mTextSettingDescription
.setText(sharedPreferences.getString(mItem.getKey() + mItem.getGameId(), ""));
} }
@Override @Override