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 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 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 @@ Interface Use Panic Handlers 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. + Show On-Screen Display Messages + Display messages over the emulation screen area. These messages include memory card writes, video backend and CPU information, and JIT cache clearing. Video Backend diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 1dc4f3c23f..6ad68ab104 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -807,6 +807,7 @@ void SConfig::LoadDefaults() m_audio_stretch = false; m_audio_stretch_max_latency = 80; bUsePanicHandlers = true; + bOnScreenDisplayMessages = true; iPosX = INT_MIN; iPosY = INT_MIN;