summaryrefslogtreecommitdiff
path: root/Source/Android/app/src
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2022-09-17 16:10:45 +0200
committerJosJuice <josjuice@gmail.com>2023-03-07 17:39:34 +0100
commit1788a797e76779c568de88605d567b1407cb992d (patch)
tree757205ec880e189505cb6fe564b9719ca4b9166c /Source/Android/app/src
parent6b5f82c12f0230c1595fd6c4cdff8239013b6886 (diff)
Android: Add "more settings" button to overlay control setting dialog
Some people might wonder where the ability to select an extension and the Sideways Wii Remote went. This button will take them to the general settings, which is where those settings now live. At some point in the future, we should probably move everything to the general settings. But this pull request is already big enough as it is!
Diffstat (limited to 'Source/Android/app/src')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java2
-rw-r--r--Source/Android/app/src/main/res/values/strings.xml1
2 files changed, 3 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index 9780f8de7b..9aebeb1ded 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -1015,6 +1015,8 @@ public final class EmulationActivity extends AppCompatActivity implements ThemeP
editor.apply();
mEmulationFragment.refreshInputOverlay(mSettings);
})
+ .setNeutralButton(R.string.emulation_more_controller_settings,
+ (dialogInterface, i) -> SettingsActivity.launch(this, MenuTag.SETTINGS))
.show();
}
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 3c15318f01..f2ecd4512c 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -573,6 +573,7 @@ It can efficiently compress both junk data and encrypted Wii data.
<string name="emulation_control_adjustments">Adjust Controls</string>
<string name="emulation_control_joystick_rel_center">Relative Stick Center</string>
<string name="emulation_choose_controller">Choose Controller</string>
+ <string name="emulation_more_controller_settings">More Settings</string>
<string name="emulation_menu_help">Press Back to access the menu.\nLong press Back to exit emulation.</string>
<string name="emulation_touch_overlay_reset">Reset Overlay</string>
<string name="emulation_ir_group">Touch IR Pointer</string>