Browse Source
[android, frontend_common] Remove network/logging sections and fix airplane mode in per-game (#3384)
Fixed an issue with airplane settings
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3384
Reviewed-by: DraVee <dravee@eden-emu.dev>
Reviewed-by: Maufeat <sahyno1996@gmail.com>
Co-authored-by: PavelBARABANOV <pavelbarabanov94@gmail.com>
Co-committed-by: PavelBARABANOV <pavelbarabanov94@gmail.com>
pull/3386/head
PavelBARABANOV
2 weeks ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
2 changed files with
12 additions and
8 deletions
-
src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt
-
src/frontend_common/config.cpp
|
|
|
@ -242,9 +242,11 @@ class SettingsFragmentPresenter( |
|
|
|
add(BooleanSetting.USE_CUSTOM_CPU_TICKS.key) |
|
|
|
add(IntSetting.CPU_TICKS.key) |
|
|
|
|
|
|
|
add(HeaderSetting(R.string.network)) |
|
|
|
add(StringSetting.WEB_TOKEN.key) |
|
|
|
add(StringSetting.WEB_USERNAME.key) |
|
|
|
if (!NativeConfig.isPerGameConfigLoaded()) { |
|
|
|
add(HeaderSetting(R.string.network)) |
|
|
|
add(StringSetting.WEB_TOKEN.key) |
|
|
|
add(StringSetting.WEB_USERNAME.key) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -1206,9 +1208,11 @@ class SettingsFragmentPresenter( |
|
|
|
add(SettingsItem.FASTMEM_COMBINED) |
|
|
|
add(BooleanSetting.CPUOPT_UNSAFE_HOST_MMU.key) |
|
|
|
|
|
|
|
add(HeaderSetting(R.string.log)) |
|
|
|
if (!NativeConfig.isPerGameConfigLoaded()) { |
|
|
|
add(HeaderSetting(R.string.log)) |
|
|
|
|
|
|
|
add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key) |
|
|
|
add(BooleanSetting.DEBUG_FLUSH_BY_LINE.key) |
|
|
|
} |
|
|
|
|
|
|
|
add(HeaderSetting(R.string.general)) |
|
|
|
|
|
|
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
|
|
|
|
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
|
|
|
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
|
|
|
|
// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
|
|
|
|
@ -423,12 +423,12 @@ void Config::ReadValues() { |
|
|
|
ReadDataStorageValues(); |
|
|
|
ReadDebuggingValues(); |
|
|
|
ReadDisabledAddOnValues(); |
|
|
|
ReadNetworkValues(); |
|
|
|
ReadServiceValues(); |
|
|
|
ReadWebServiceValues(); |
|
|
|
ReadMiscellaneousValues(); |
|
|
|
ReadLibraryAppletValues(); |
|
|
|
} |
|
|
|
ReadNetworkValues(); |
|
|
|
ReadControlValues(); |
|
|
|
ReadCoreValues(); |
|
|
|
ReadCpuValues(); |
|
|
|
@ -522,13 +522,13 @@ void Config::SaveValues() { |
|
|
|
SaveDataStorageValues(); |
|
|
|
SaveDebuggingValues(); |
|
|
|
SaveDisabledAddOnValues(); |
|
|
|
SaveNetworkValues(); |
|
|
|
SaveWebServiceValues(); |
|
|
|
SaveMiscellaneousValues(); |
|
|
|
SaveLibraryAppletValues(); |
|
|
|
} else { |
|
|
|
LOG_DEBUG(Config, "Saving only generic configuration values"); |
|
|
|
} |
|
|
|
SaveNetworkValues(); |
|
|
|
SaveControlValues(); |
|
|
|
SaveCoreValues(); |
|
|
|
SaveCpuValues(); |
|
|
|
|