summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorzackhow <zackhow@gmail.com>2018-10-28 22:28:55 -0400
committerzackhow <zackhow@gmail.com>2018-10-28 23:18:17 -0400
commite02b80cfa8762cde28eb989b32cf904186e95483 (patch)
tree21449cdb1ce24339d61ab83682b9cab632fe07da /Source/Android/app/src/main/java
parent2b905eb06a806bc654281910d92693e2dcb6f201 (diff)
Android: fix custom game control ui
Missed in previous rebase
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java2
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/RumbleBindingViewHolder.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java
index 0c6a3bc314..03b23bf328 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java
@@ -75,7 +75,7 @@ public class InputBindingSetting extends SettingsItem
preferences =
PreferenceManager.getDefaultSharedPreferences(DolphinApplication.getAppContext());
SharedPreferences.Editor editor = preferences.edit();
- editor.putString(getKey(), ui);
+ editor.putString(getKey() + gameId, ui);
editor.apply();
if (getSetting() == null)
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/RumbleBindingViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/RumbleBindingViewHolder.java
index 9720a1b977..dd86a52bc0 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/RumbleBindingViewHolder.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/RumbleBindingViewHolder.java
@@ -42,7 +42,8 @@ public class RumbleBindingViewHolder extends SettingViewHolder
mItem = (RumbleBindingSetting) item;
mTextSettingName.setText(item.getNameId());
- mTextSettingDescription.setText(sharedPreferences.getString(mItem.getKey(), ""));
+ mTextSettingDescription
+ .setText(sharedPreferences.getString(mItem.getKey() + mItem.getGameId(), ""));
}
@Override