diff options
| author | Ryan Meredith <rwm@udel.edu> | 2018-03-23 11:36:11 -0400 |
|---|---|---|
| committer | Ryan Meredith <rwm@udel.edu> | 2018-05-03 16:05:22 -0400 |
| commit | c2355d4f633d21b5ba2c4bcd4836055c4eab9bb5 (patch) | |
| tree | f1ac8ae1d51e11103f60628cc3720bc9ae778883 /Source/Android/app/src | |
| parent | 25179258b78b75f3cdf3f062197408db1076019d (diff) | |
Android Interface submenu: Add Show OSD Messages
Diffstat (limited to 'Source/Android/app/src')
3 files changed, 6 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java index 11cbf9af9a..c87387c3dc 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java @@ -246,12 +246,15 @@ public final class SettingsFragmentPresenter private void addInterfaceSettings(ArrayList<SettingsItem> sl) { Setting usePanicHandlers = null; + Setting onScreenDisplayMessages = null; if (!mSettings.get(SettingsFile.SETTINGS_DOLPHIN).isEmpty()) { usePanicHandlers = mSettings.get(SettingsFile.SETTINGS_DOLPHIN).get(SettingsFile.SECTION_INTERFACE).getSetting(SettingsFile.KEY_USE_PANIC_HANDLERS); + onScreenDisplayMessages = mSettings.get(SettingsFile.SETTINGS_DOLPHIN).get(SettingsFile.SECTION_INTERFACE).getSetting(SettingsFile.KEY_OSD_MESSAGES); } sl.add(new CheckBoxSetting(SettingsFile.KEY_USE_PANIC_HANDLERS, SettingsFile.SECTION_INTERFACE, SettingsFile.SETTINGS_DOLPHIN, R.string.panic_handlers, R.string.panic_handlers_description, true, usePanicHandlers)); + sl.add(new CheckBoxSetting(SettingsFile.KEY_OSD_MESSAGES, SettingsFile.SECTION_INTERFACE, SettingsFile.SETTINGS_DOLPHIN, R.string.osd_messages, R.string.osd_messages_description, true, onScreenDisplayMessages)); } private void addGcPadSettings(ArrayList<SettingsItem> sl) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java index aec9b4953c..1791bfce72 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java @@ -88,6 +88,7 @@ public final class SettingsFile public static final String KEY_SLOT_B_DEVICE = "SlotB"; public static final String KEY_USE_PANIC_HANDLERS = "UsePanicHandlers"; + public static final String KEY_OSD_MESSAGES = "OnScreenDisplayMessages"; public static final String KEY_SHOW_FPS = "ShowFPS"; public static final String KEY_INTERNAL_RES = "InternalResolution"; diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index d593a1af42..bacea5db5e 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -131,6 +131,8 @@ <string name="interface_submenu">Interface</string> <string name="panic_handlers">Use Panic Handlers</string> <string name="panic_handlers_description">Show a message box when a potentially serious error has occurred. Disabling this may avoid annoying and non-fatal messages, but it may result in major crashes having no explanation at all.</string> + <string name="osd_messages">Show On-Screen Display Messages</string> + <string name="osd_messages_description">Display messages over the emulation screen area. These messages include memory card writes, video backend and CPU information, and JIT cache clearing.</string> <!-- Video Preference Fragment --> <string name="video_backend">Video Backend</string> |