Updated language translations via Transifex

.ci/license-header.rb

@@ -17,7 +17,7 @@ puts 'done'
 print 'Checking files...'
 issue_files = []
 branch_changed_files.each do |file_name|
-   if file_name.end_with?('.cpp', '.h', '.kt', '.kts', '.m', '.mm') and File.file?(file_name)
+   if file_name.end_with?('.cpp', '.h', '.kt', '.kts') and File.file?(file_name)
       file_content = File.read(file_name, mode: 'r:bom|utf-8')
       if not file_content.start_with?(license_header)
          issue_files.push(file_name)

.github/workflows/build.yml

@@ -25,7 +25,6 @@ jobs:
   linux:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: false
       matrix:
         target: ["appimage", "fresh"]
     container:
@@ -62,9 +61,8 @@ jobs:
           name: ${{ env.OS }}-${{ env.TARGET }}
           path: artifacts/
   macos:
-    runs-on: ${{ (matrix.target == 'x86_64' && 'macos-15-intel') || 'macos-26' }}
+    runs-on: ${{ (matrix.target == 'x86_64' && 'macos-13') || 'macos-14' }}
     strategy:
-      fail-fast: false
       matrix:
         target: ["x86_64", "arm64"]
     env:
@@ -89,21 +87,14 @@ jobs:
       - name: Build
         run: ./.ci/macos.sh
       - name: Prepare outputs for caching
-        run: cp -R build/bundle $OS-$TARGET
+        run: mv build/bundle $OS-$TARGET
       - name: Cache outputs for universal build
         uses: actions/cache/save@v4
         with:
           path: ${{ env.OS }}-${{ env.TARGET }}
           key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Pack
-        run: ./.ci/pack.sh
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.OS }}-${{ env.TARGET }}
-          path: artifacts/
   macos-universal:
-    runs-on: macos-26
+    runs-on: macos-14
     needs: macos
     env:
       OS: macos
@@ -136,7 +127,6 @@ jobs:
   windows:
     runs-on: windows-latest
     strategy:
-      fail-fast: false
       matrix:
         target: ["msvc", "msys2"]
     defaults:
@@ -242,9 +232,6 @@ jobs:
         run: |
           sudo apt-get update -y
           sudo apt-get install ccache apksigner -y
-      - name: Update Android SDK CMake version
-        run: |
-          echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "cmake;3.30.3"
       - name: Build
         run: JAVA_HOME=$JAVA_HOME_17_X64 ./.ci/android.sh
         env:
@@ -261,3 +248,28 @@ jobs:
         with:
           name: ${{ env.OS }}-${{ env.TARGET }}
           path: src/android/app/artifacts/
+  ios:
+    if: ${{ !startsWith(github.ref, 'refs/tags/') }}
+    runs-on: macos-14
+    env:
+      CCACHE_DIR: ${{ github.workspace }}/.ccache
+      CCACHE_COMPILERCHECK: content
+      CCACHE_SLOPPINESS: time_macros
+      OS: ios
+      TARGET: arm64
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Set up cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ runner.os }}-ios-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-ios-
+      - name: Install tools
+        run: brew install ccache ninja
+      - name: Build
+        run: ./.ci/ios.sh
+

.gitmodules

@@ -77,7 +77,7 @@
     path = externals/vulkan-headers
     url = https://github.com/KhronosGroup/Vulkan-Headers
 [submodule "sirit"]
-	path = externals/sirit/sirit
+    path = externals/sirit
     url = https://github.com/azahar-emu/sirit
 [submodule "faad2"]
     path = externals/faad2/faad2
@@ -94,9 +94,3 @@
 [submodule "compatibility-list"]
 	path = dist/compatibility_list
 	url = https://github.com/azahar-emu/compatibility-list
-[submodule "spirv-tools"]
-	path = externals/spirv-tools
-	url = https://github.com/KhronosGroup/SPIRV-Tools
-[submodule "spirv-headers"]
-	path = externals/spirv-headers
-	url = https://github.com/KhronosGroup/SPIRV-Headers

CMakeLists.txt

@@ -1,6 +1,5 @@
-# CMake >=3.12 required for 20 to be a valid value for CXX_STANDARD,
+# CMake 3.12 required for 20 to be a valid value for CXX_STANDARD
-# and >=3.25 required to make LTO work on Android.
+cmake_minimum_required(VERSION 3.15)
-cmake_minimum_required(VERSION 3.25)
 
 # Don't override the warning flags in MSVC:
 cmake_policy(SET CMP0092 NEW)
@@ -17,12 +16,8 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
 include(DownloadExternals)
 include(CMakeDependentOption)
-include(FindPkgConfig)
 
 project(citra LANGUAGES C CXX ASM)
-if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR CMAKE_SYSTEM_NAME STREQUAL "iOS")
-    enable_language(OBJC OBJCXX)
-endif()
 
 # Some submodules like to pick their own default build type if not specified.
 # Make sure we default to Release build type always, unless the generator has custom types.
@@ -48,15 +43,6 @@ if (APPLE)
     else()
         # Minimum macOS 13
         set(CMAKE_OSX_DEPLOYMENT_TARGET "13.4")
-
-        # Catch compiler issue on AppleClang versions below 15.0
-        # TODO: Remove this check when we drop macOS 13 Ventura
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" AND
-            CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0)
-            message(FATAL_ERROR "AppleClang 15.0 or later is required due to a compiler bug in earlier versions.\n"
-                                "Current version: ${CMAKE_CXX_COMPILER_VERSION}\n"
-                                "After updating, delete 'CMakeCache.txt' in the build directory.")
-        endif()
     endif()
 endif()
 
@@ -121,8 +107,6 @@ option(ENABLE_MICROPROFILE "Enables microprofile capabilities" OFF)
 
 option(ENABLE_SSE42 "Enable SSE4.2 optimizations on x86_64" ON)
 
-option(ENABLE_DEVELOPER_OPTIONS "Enable functionality targeted at emulator developers" OFF)
-
 # Compile options
 CMAKE_DEPENDENT_OPTION(COMPILE_WITH_DWARF "Add DWARF debugging information" ${IS_DEBUG_BUILD} "MINGW" OFF)
 option(ENABLE_LTO "Enable link time optimization" ${DEFAULT_ENABLE_LTO})
@@ -140,9 +124,6 @@ endif()
 if (ENABLE_ROOM)
     add_definitions(-DENABLE_ROOM)
 endif()
-if (ENABLE_SDL2)
-    add_definitions(-DENABLE_SDL2)
-endif()
 if (ENABLE_SDL2_FRONTEND)
     add_definitions(-DENABLE_SDL2_FRONTEND)
 endif()
@@ -310,7 +291,7 @@ find_package(Threads REQUIRED)
 
 if (ENABLE_QT)
     if (NOT USE_SYSTEM_QT)
-        download_qt(6.9.2)
+        download_qt(6.7.2)
     endif()
 
     find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent)
@@ -493,10 +474,12 @@ if (ENABLE_SDL2 AND USE_SYSTEM_SDL2)
 endif()
 
 if (ENABLE_LIBUSB AND USE_SYSTEM_LIBUSB)
+    include(FindPkgConfig)
     find_package(LibUSB)
 endif()
 
 if (USE_SYSTEM_SOUNDTOUCH)
+    include(FindPkgConfig)
     find_package(SoundTouch REQUIRED)
     add_library(SoundTouch INTERFACE)
     target_link_libraries(SoundTouch INTERFACE "${SOUNDTOUCH_LIBRARIES}")

CMakeModules/DownloadExternals.cmake

@@ -20,9 +20,9 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_out
                 set(arch_path "mingw_64")
             elseif (MSVC)
                 if ("arm64" IN_LIST ARCHITECTURE)
-                    set(arch_path "msvc2022_arm64")
+                    set(arch_path "msvc2019_arm64")
                 elseif ("x86_64" IN_LIST ARCHITECTURE)
-                    set(arch_path "msvc2022_64")
+                    set(arch_path "msvc2019_64")
                 else()
                     message(FATAL_ERROR "Unsupported bundled Qt architecture. Enable USE_SYSTEM_QT and provide your own.")
                 endif()
@@ -30,13 +30,12 @@ function(determine_qt_parameters target host_out type_out arch_out arch_path_out
 
                 # In case we're cross-compiling, prepare to also fetch the correct host Qt tools.
                 if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64")
-                    set(host_arch_path "msvc2022_64")
+                    set(host_arch_path "msvc2019_64")
                 elseif (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64")
                     # TODO: msvc2019_arm64 doesn't include some of the required tools for some reason,
                     # TODO: so until it does, just use msvc2019_64 under x86_64 emulation.
-                    # TODO: ^ Is this still true with msvc2022?
                     # set(host_arch_path "msvc2019_arm64")
-                    set(host_arch_path "msvc2022_64")
+                    set(host_arch_path "msvc2019_64")
                 endif()
                 set(host_arch "win64_${host_arch_path}")
             else()
@@ -106,7 +105,7 @@ function(download_qt_configuration prefix_out target host type arch arch_path ba
 
     if (NOT EXISTS "${prefix}")
         message(STATUS "Downloading Qt binaries for ${target}:${host}:${type}:${arch}:${arch_path}")
-        set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.3.0")
+        set(AQT_PREBUILD_BASE_URL "https://github.com/miurahr/aqtinstall/releases/download/v3.1.18")
         if (WIN32)
             set(aqt_path "${base_path}/aqt.exe")
             if (NOT EXISTS "${aqt_path}")

README.md

@@ -22,12 +22,9 @@ If you are unsure of whether you want to use MSYS2 or MSVC, use MSYS2.
 
 ### MacOS
 
-To download a build that will work on all Macs, you can download the `macos-universal` build on the [Releases](https://github.com/azahar-emu/azahar/releases) page.
+Download the latest release from [Releases](https://github.com/azahar-emu/azahar/releases).
 
-Alternatively, if you wish to download a build specifically for your Mac, you can choose either:
+The `macos-universal` download will work on both Intel and Apple Silicon Macs.
-
-- `macos-arm64` for Apple Silicon Macs
-- `macos-x86_64` for Intel Macs
 
 ---
 ### Android

dist/apple/Info.plist.in

@@ -75,9 +75,6 @@
     <true/>
     <key>NSHighResolutionCapable</key>
     <string>True</string>
-    <key>UIDesignRequiresCompatibility</key>
-    <true/> <!-- Remove when Qt Liquid Glass issues are fixed upstream:
-                 https://bugreports.qt.io/browse/QTBUG-138942 -->
     <key>UIFileSharingEnabled</key>
     <true/>
     <key>UILaunchStoryboardName</key>

dist/compatibility_list

@@ -1 +1 @@
-Subproject commit a36decbe43d0e5a570ac3d3ba9a0b226dc832a17
+Subproject commit 31c12299126baf892b965defc6ba7810b9c42ccf

externals/CMakeLists.txt

@@ -1,37 +1,24 @@
 # Definitions for all external bundled libraries
 
 # Suppress warnings from external libraries
-if (MSVC)
+if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     add_compile_options(/W0)
 else()
     add_compile_options(-w)
 endif()
 
-function(target_disable_warnings target)
-    if (MSVC)
-        target_compile_options(${target} INTERFACE /W0)
-    else()
-        target_compile_options(${target} INTERFACE -w)
-    endif()
-endfunction()
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 include(DownloadExternals)
 include(ExternalProject)
 
 # Boost
-if (USE_SYSTEM_BOOST)
+if (NOT USE_SYSTEM_BOOST)
-    unset(BOOST_ROOT CACHE)
-    unset(Boost_INCLUDE_DIR CACHE)
-    set(Boost_NO_SYSTEM_PATHS OFF CACHE BOOL "" FORCE)
-else()
     message(STATUS "Including vendored Boost library")
     set(BOOST_ROOT "${CMAKE_SOURCE_DIR}/externals/boost" CACHE STRING "")
     set(Boost_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/boost" CACHE STRING "")
     set(Boost_NO_SYSTEM_PATHS ON CACHE BOOL "")
     add_library(boost INTERFACE)
-    target_include_directories(boost INTERFACE ${Boost_INCLUDE_DIR})
+    target_include_directories(boost SYSTEM INTERFACE ${Boost_INCLUDE_DIR})
-    target_disable_warnings(boost)
 
     # Boost::serialization
     file(GLOB boost_serialization_SRC "${CMAKE_SOURCE_DIR}/externals/boost/libs/serialization/src/*.cpp")
@@ -46,7 +33,11 @@ else()
         ${CMAKE_SOURCE_DIR}/externals/boost/libs/iostreams/src/mapped_file.cpp
     )
     target_link_libraries(boost_iostreams PUBLIC boost)
-    # Add additional boost libs here; remember to ALIAS them in the root CMakeLists!
+# Add additional boost libs here; remember to ALIAS them in the root CMakeLists!
+else()
+    unset(BOOST_ROOT CACHE)
+    unset(Boost_INCLUDE_DIR CACHE)
+    set(Boost_NO_SYSTEM_PATHS OFF CACHE BOOL "" FORCE)
 endif()
 
 # Catch2
@@ -82,7 +73,6 @@ endif()
 # dds-ktx
 add_library(dds-ktx INTERFACE)
 target_include_directories(dds-ktx INTERFACE ./dds-ktx)
-target_disable_warnings(dds-ktx)
 
 # fmt and Xbyak need to be added before dynarmic
 # libfmt
@@ -147,8 +137,7 @@ endif()
 
 # MicroProfile
 add_library(microprofile INTERFACE)
-target_include_directories(microprofile INTERFACE ./microprofile)
+target_include_directories(microprofile SYSTEM INTERFACE ./microprofile)
-target_disable_warnings(microprofile)
 if (ENABLE_MICROPROFILE)
     target_compile_definitions(microprofile INTERFACE MICROPROFILE_ENABLED=1)
 else()
@@ -157,11 +146,10 @@ endif()
 
 # Nihstro
 add_library(nihstro-headers INTERFACE)
-target_include_directories(nihstro-headers INTERFACE ./nihstro/include)
+target_include_directories(nihstro-headers SYSTEM INTERFACE ./nihstro/include)
-target_disable_warnings(nihstro-headers)
+if (MSVC)
-if (NOT MSVC)
+    # TODO: For some reason MSVC still applies this warning even with /W0 for externals.
-    # TODO: For some reason MSYS2 still applied this warnin even with -w
+    target_compile_options(nihstro-headers INTERFACE /wd4715)
-    target_compile_options(nihstro-headers INTERFACE -Wno-invalid-specialization)
 endif()
 
 # Open Source Archives
@@ -185,8 +173,7 @@ if (USE_SYSTEM_FFMPEG_HEADERS)
 endif()
 if (NOT FOUND_FFMPEG_HEADERS)
     message(STATUS "Using bundled ffmpeg headers.")
-    target_include_directories(library-headers INTERFACE ./library-headers/ffmpeg/include)
+    target_include_directories(library-headers SYSTEM INTERFACE ./library-headers/ffmpeg/include)
-    target_disable_warnings(library-headers)
 endif()
 
 # SoundTouch
@@ -227,29 +214,8 @@ else()
     set(ZSTD_BUILD_PROGRAMS OFF)
     set(ZSTD_BUILD_SHARED OFF)
     add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)
-
+    target_include_directories(libzstd_static INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/externals/zstd/lib>)
-    target_include_directories(libzstd_static INTERFACE
-        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/externals/zstd/lib>
-        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/externals/zstd/lib/common>
-    )
-
-    add_library(zstd_seekable STATIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/zstd/contrib/seekable_format/zstdseek_compress.c>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/zstd/contrib/seekable_format/zstdseek_decompress.c>
-    )
-    target_include_directories(zstd_seekable PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/zstd/contrib/seekable_format>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/zstd/lib/common>
-    )
-    target_link_libraries(zstd_seekable PUBLIC libzstd_static)
-
-    target_link_libraries(libzstd_static INTERFACE zstd_seekable)
-
     add_library(zstd ALIAS libzstd_static)
-
-    install(TARGETS zstd_seekable
-        EXPORT zstdExports
-    )
 endif()
 
 # ENet
@@ -307,8 +273,7 @@ if (USE_SYSTEM_JSON)
     # Citra uses "#include <json.hpp>" so we have to add this manually
     target_include_directories(json-headers SYSTEM INTERFACE "${NLOHMANN_PREFIX}/nlohmann")
 else()
-    target_include_directories(json-headers INTERFACE ./json)
+    target_include_directories(json-headers SYSTEM INTERFACE ./json)
-    target_disable_warnings(json-headers)
 endif()
 
 # OpenSSL
@@ -324,8 +289,7 @@ if (NOT OPENSSL_FOUND)
     set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
     set(OPENSSLDIR "/etc/ssl/")
     add_subdirectory(libressl EXCLUDE_FROM_ALL)
-    target_include_directories(ssl INTERFACE ./libressl/include)
+    target_include_directories(ssl SYSTEM INTERFACE ./libressl/include)
-    target_disable_warnings(ssl)
     target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
     get_directory_property(OPENSSL_LIBRARIES
         DIRECTORY libressl
@@ -342,20 +306,17 @@ if(USE_SYSTEM_CPP_HTTPLIB)
     get_target_property(HTTP_LIBS httplib::httplib INTERFACE_LINK_LIBRARIES)
     if(HTTP_LIBS)
         message(WARNING "Shared cpp-http (${HTTP_LIBS}) not supported. Falling back to bundled...")
-        target_include_directories(httplib INTERFACE ./httplib)
+        target_include_directories(httplib SYSTEM INTERFACE ./httplib)
-        target_disable_warnings(httplib)
     else()
         if(CppHttp_FOUND)
             target_link_libraries(httplib INTERFACE httplib::httplib)
         else()
             message(STATUS "Cpp-httplib not found or not suitable version! Falling back to bundled...")
-            target_include_directories(httplib INTERFACE ./httplib)
+            target_include_directories(httplib SYSTEM INTERFACE ./httplib)
-            target_disable_warnings(httplib)
         endif()
     endif()
 else()
-    target_include_directories(httplib INTERFACE ./httplib)
+    target_include_directories(httplib SYSTEM INTERFACE ./httplib)
-    target_disable_warnings(httplib)
 endif()
 target_compile_options(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
 target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
@@ -372,8 +333,7 @@ if (ENABLE_WEB_SERVICE)
         target_link_libraries(cpp-jwt INTERFACE cpp-jwt::cpp-jwt)
     else()
         add_library(cpp-jwt INTERFACE)
-        target_include_directories(cpp-jwt INTERFACE ./cpp-jwt/include)
+        target_include_directories(cpp-jwt SYSTEM INTERFACE ./cpp-jwt/include)
-        target_disable_warnings(cpp-jwt)
         target_compile_definitions(cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
     endif()
 endif()
@@ -421,24 +381,6 @@ endif()
 
 # Vulkan dependencies
 if (ENABLE_VULKAN)
-    # spirv-headers
-    if(USE_SYSTEM_SPIRV_HEADERS)
-        find_package(SPIRV-Headers REQUIRED)
-        if(TARGET SPIRV-Headers::SPIRV-Headers)
-            message(STATUS "Found SPIRV headers")
-            get_target_property(SPIRV-Headers_SOURCE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
-            set(SPIRV-Headers_SOURCE_DIR "${SPIRV-Headers_SOURCE_DIR}/../") # Not sure why this is necessary
-        endif()
-    else()
-        set(SPIRV-Headers_SOURCE_DIR "${CMAKE_SOURCE_DIR}/externals/spirv-headers")
-        add_subdirectory(spirv-headers EXCLUDE_FROM_ALL)
-    endif()
-
-    # spirv-tools
-    # TODO: Implement USE_SYSTEM_SPIRV_TOOLS -OS
-    set(SPIRV_SKIP_EXECUTABLES ON)
-    add_subdirectory(spirv-tools EXCLUDE_FROM_ALL)
-
     # glslang
     if(USE_SYSTEM_GLSLANG)
         find_package(glslang REQUIRED)
@@ -456,6 +398,7 @@ if (ENABLE_VULKAN)
         set(ENABLE_CTEST OFF CACHE BOOL "")
         set(ENABLE_HLSL OFF CACHE BOOL "")
         set(BUILD_EXTERNAL OFF CACHE BOOL "")
+        set(ALLOW_EXTERNAL_SPIRV_TOOLS ON)
         add_subdirectory(glslang)
     endif()
 
@@ -472,8 +415,7 @@ if (ENABLE_VULKAN)
         endif()
     else()
         add_library(vma INTERFACE)
-        target_include_directories(vma INTERFACE ./vma/include)
+        target_include_directories(vma SYSTEM INTERFACE ./vma/include)
-        target_disable_warnings(vma)
     endif()
 
     # vulkan-headers
@@ -485,8 +427,7 @@ if (ENABLE_VULKAN)
             target_link_libraries(vulkan-headers INTERFACE Vulkan::Headers)
         endif()
     else()
-        target_include_directories(vulkan-headers INTERFACE ./vulkan-headers/include)
+        target_include_directories(vulkan-headers SYSTEM INTERFACE ./vulkan-headers/include)
-        target_disable_warnings(vulkan-headers)
     endif()
 
     # adrenotools

externals/cmake-modules/CitraHandleSystemLibs.cmake

@@ -25,7 +25,6 @@ option(USE_SYSTEM_LODEPNG "Use the system lodepng (instead of the bundled one)"
 option(USE_SYSTEM_OPENAL "Use the system OpenAL (instead of the bundled one)" OFF)
 option(USE_SYSTEM_VMA "Use the system VulkanMemoryAllocator (instead of the bundled one)" OFF)
 option(USE_SYSTEM_VULKAN_HEADERS "Use the system Vulkan headers (instead of the bundled ones)" OFF)
-option(USE_SYSTEM_SPIRV_HEADERS "Use the system SPIRV headers (instead of the bundled ones)" OFF)
 option(USE_SYSTEM_CATCH2 "Use the system Catch2 (instead of the bundled one)" OFF)
 
 # Qt and MoltenVK are handled separately
@@ -51,7 +50,6 @@ CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_LODEPNG "Disable system lodepng" OFF "USE_
 CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_OPENAL "Disable system OpenAL" OFF "USE_SYSTEM_LIBS" OFF)
 CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_VMA "Disable system VulkanMemoryAllocator" OFF "USE_SYSTEM_LIBS" OFF)
 CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_VULKAN_HEADERS "Disable system Vulkan headers" OFF "USE_SYSTEM_LIBS" OFF)
-CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_SPIRV_HEADERS "Disable system SPIRV headers" OFF "USE_SYSTEM_LIBS" OFF)
 CMAKE_DEPENDENT_OPTION(DISABLE_SYSTEM_CATCH2 "Disable system Catch2" OFF "USE_SYSTEM_LIBS" OFF)
 
 set(LIB_VAR_LIST
@@ -77,7 +75,6 @@ set(LIB_VAR_LIST
     OPENAL
     VMA
     VULKAN_HEADERS
-    SPIRV_HEADERS
     CATCH2
     )
 

externals/fmt

@@ -1 +1 @@
-Subproject commit e424e3f2e607da02742f73db84873b8084fc714c
+Subproject commit 123913715afeb8a437e6388b4473fcc4753e1c9a

externals/glslang

@@ -1 +1 @@
-Subproject commit fc9889c889561c5882e83819dcaffef5ed45529b
+Subproject commit b3a6aa7b03c51ba976e4f4e96b1e31f77f43f312

externals/libyuv

@@ -1 +1 @@
-Subproject commit 6f729fbe658a40dfd993fa8b22bd612bb17cde5c
+Subproject commit c060118bea3f28ceb837d3c85e479d3bb4c21726

externals/sirit/CMakeLists.txt

@@ -1,91 +0,0 @@
-# This file has been adapted from dynarmic
-
-cmake_minimum_required(VERSION 3.8)
-project(sirit CXX)
-
-# Determine if we're built as a subproject (using add_subdirectory)
-# or if this is the master project.
-set(MASTER_PROJECT OFF)
-if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
-  set(MASTER_PROJECT ON)
-endif()
-
-# Sirit project options
-option(SIRIT_TESTS "Build tests" OFF)
-option(SIRIT_USE_SYSTEM_SPIRV_HEADERS "Use system SPIR-V headers" OFF)
-
-# Default to a Release build
-if (NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
-    message(STATUS "Defaulting to a Release build")
-endif()
-
-# Set hard requirements for C++
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-# Warn on CMake API deprecations
-set(CMAKE_WARN_DEPRECATED ON)
-
-# Disable in-source builds
-set(CMAKE_DISABLE_SOURCE_CHANGES ON)
-set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
-if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
-    message(SEND_ERROR "In-source builds are not allowed.")
-endif()
-
-# Add the module directory to the list of paths
-list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules")
-
-# Compiler flags
-if (MSVC)
-    set(SIRIT_CXX_FLAGS
-        /std:c++latest # CMAKE_CXX_STANDARD as no effect on MSVC until CMake 3.10.
-        /W4
-        /w34263 # Non-virtual member function hides base class virtual function
-        /w44265 # Class has virtual functions, but destructor is not virtual
-        /w34456 # Declaration of 'var' hides previous local declaration
-        /w34457 # Declaration of 'var' hides function parameter
-        /w34458 # Declaration of 'var' hides class member
-        /w34459 # Declaration of 'var' hides global definition
-        /w34946 # Reinterpret-cast between related types
-        /wd4592 # Symbol will be dynamically initialized (implementation limitation)
-        /permissive- # Stricter C++ standards conformance
-        /MP
-        /Zi
-        /Zo
-        /EHsc
-        /Zc:throwingNew # Assumes new never returns null
-        /Zc:inline # Omits inline functions from object-file output
-        /DNOMINMAX
-        /WX)
-
-    if (CMAKE_VS_PLATFORM_TOOLSET MATCHES "LLVM-vs[0-9]+")
-        list(APPEND SIRIT_CXX_FLAGS
-             -Qunused-arguments
-             -Wno-missing-braces)
-    endif()
-else()
-    set(SIRIT_CXX_FLAGS
-        -Wall
-        -Wextra
-        -Wcast-qual
-        -pedantic
-        -pedantic-errors
-        -Wfatal-errors
-        -Wno-missing-braces
-        -Wconversion
-        -Wsign-conversion
-        -Wshadow
-        -Werror)
-endif()
-
-# Enable unit-testing.
-enable_testing(true)
-
-# Sirit project files
-add_subdirectory(sirit/src)
-if (SIRIT_TESTS)
-    add_subdirectory(sirit/tests)
-endif()

externals/spirv-headers

@@ -1 +0,0 @@
-Subproject commit aa6cef192b8e693916eb713e7a9ccadf06062ceb

externals/spirv-tools

@@ -1 +0,0 @@
-Subproject commit a62abcb402009b9ca5975e6167c09f237f630e0e

externals/vulkan-headers

@@ -1 +1 @@
-Subproject commit 409c16be502e39fe70dd6fe2d9ad4842ef2c9a53
+Subproject commit d4a196d8c84e032d27f999adcea3075517c1c97f

src/CMakeLists.txt

@@ -174,9 +174,6 @@ endif()
 if(ENABLE_VULKAN)
     add_compile_definitions(ENABLE_VULKAN)
 endif()
-if(ENABLE_DEVELOPER_OPTIONS)
-    add_compile_definitions(ENABLE_DEVELOPER_OPTIONS)
-endif()
 
 add_subdirectory(common)
 add_subdirectory(core)

src/android/app/build.gradle.kts

@@ -64,7 +64,7 @@ android {
         // The application ID refers to Lime3DS to allow for
         // the Play Store listing, which was originally set up for Lime3DS, to still be used.
         applicationId = "io.github.lime3ds.android"
-        minSdk = 29
+        minSdk = 28
         targetSdk = 35
         versionCode = autoVersion
         versionName = getGitVersion()
@@ -150,7 +150,7 @@ android {
 
     externalNativeBuild {
         cmake {
-            version = "3.25.0+"
+            version = "3.22.1"
             path = file("../../../CMakeLists.txt")
         }
     }
@@ -186,7 +186,7 @@ dependencies {
 
 // Download Vulkan Validation Layers from the KhronosGroup GitHub.
 val downloadVulkanValidationLayers = tasks.register<Download>("downloadVulkanValidationLayers") {
-    src("https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/vulkan-sdk-1.4.313.0/android-binaries-1.4.313.0.zip")
+    src("https://github.com/KhronosGroup/Vulkan-ValidationLayers/releases/download/vulkan-sdk-1.4.304.1/android-binaries-1.4.304.1.zip")
     dest(file("${layout.buildDirectory.get().asFile.path}/tmp/Vulkan-ValidationLayers.zip"))
     onlyIfModified(true)
 }

src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -58,7 +58,6 @@ class CitraApplication : Application() {
         NativeLibrary.logDeviceInfo()
         logDeviceInfo()
         createNotificationChannel()
-        NativeLibrary.playTimeManagerInit()
     }
 
     fun logDeviceInfo() {

src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt

@@ -21,6 +21,7 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.citra.citra_emu.activities.EmulationActivity
+import org.citra.citra_emu.utils.EmulationMenuSettings
 import org.citra.citra_emu.utils.FileUtil
 import org.citra.citra_emu.utils.Log
 import java.lang.ref.WeakReference
@@ -96,24 +97,6 @@ object NativeLibrary {
      */
     external fun onTouchMoved(xAxis: Float, yAxis: Float)
 
-    /**
-     * Handles touch events on the secondary display.
-     *
-     * @param xAxis  The value of the x-axis.
-     * @param yAxis  The value of the y-axis.
-     * @param pressed To identify if the touch held down or released.
-     * @return true if the pointer is within the touchscreen
-     */
-    external fun onSecondaryTouchEvent(xAxis: Float, yAxis: Float, pressed: Boolean): Boolean
-
-    /**
-     * Handles touch movement on the secondary display.
-     *
-     * @param xAxis The value of the instantaneous x-axis.
-     * @param yAxis The value of the instantaneous y-axis.
-     */
-    external fun onSecondaryTouchMoved(xAxis: Float, yAxis: Float)
-
     external fun reloadSettings()
 
     external fun getTitleId(filename: String): Long
@@ -142,10 +125,6 @@ object NativeLibrary {
     external fun surfaceDestroyed()
     external fun doFrame()
 
-    // Second window
-    external fun secondarySurfaceChanged(secondary_surface: Surface)
-    external fun secondarySurfaceDestroyed()
-
     /**
      * Unpauses emulation from a paused state.
      */
@@ -211,12 +190,6 @@ object NativeLibrary {
 
     external fun disableTemporaryFrameLimit()
 
-    external fun playTimeManagerInit()
-    external fun playTimeManagerStart(titleId: Long)
-    external fun playTimeManagerStop()
-    external fun playTimeManagerGetPlayTime(titleId: Long): Long
-    external fun playTimeManagerGetCurrentTitleId(): Long
-
     private var coreErrorAlertResult = false
     private val coreErrorAlertLock = Object()
 

src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt

@@ -6,6 +6,7 @@ package org.citra.citra_emu.activities
 
 import android.Manifest.permission
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
@@ -20,7 +21,6 @@ import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.os.BundleCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
@@ -33,7 +33,6 @@ import org.citra.citra_emu.camera.StillImageCameraHelper.OnFilePickerResult
 import org.citra.citra_emu.contracts.OpenFileResultContract
 import org.citra.citra_emu.databinding.ActivityEmulationBinding
 import org.citra.citra_emu.display.ScreenAdjustmentUtil
-import org.citra.citra_emu.display.SecondaryDisplay
 import org.citra.citra_emu.features.hotkeys.HotkeyUtility
 import org.citra.citra_emu.features.settings.model.BooleanSetting
 import org.citra.citra_emu.features.settings.model.IntSetting
@@ -41,13 +40,12 @@ import org.citra.citra_emu.features.settings.model.SettingsViewModel
 import org.citra.citra_emu.features.settings.model.view.InputBindingSetting
 import org.citra.citra_emu.fragments.EmulationFragment
 import org.citra.citra_emu.fragments.MessageDialogFragment
-import org.citra.citra_emu.model.Game
 import org.citra.citra_emu.utils.ControllerMappingHelper
 import org.citra.citra_emu.utils.FileBrowserHelper
 import org.citra.citra_emu.utils.EmulationLifecycleUtil
 import org.citra.citra_emu.utils.EmulationMenuSettings
-import org.citra.citra_emu.utils.Log
 import org.citra.citra_emu.utils.ThemeUtil
+import org.citra.citra_emu.utils.TurboHelper
 import org.citra.citra_emu.viewmodel.EmulationViewModel
 
 class EmulationActivity : AppCompatActivity() {
@@ -60,15 +58,6 @@ class EmulationActivity : AppCompatActivity() {
     private lateinit var binding: ActivityEmulationBinding
     private lateinit var screenAdjustmentUtil: ScreenAdjustmentUtil
     private lateinit var hotkeyUtility: HotkeyUtility
-    private lateinit var secondaryDisplay: SecondaryDisplay
-
-    private val onShutdown = Runnable {
-        if (intent.getBooleanExtra("launched_from_shortcut", false)) {
-            finishAffinity()
-        } else {
-            this.finish()
-        }
-    }
 
     private val emulationFragment: EmulationFragment
         get() {
@@ -83,10 +72,10 @@ class EmulationActivity : AppCompatActivity() {
         requestWindowFeature(Window.FEATURE_NO_TITLE)
 
         ThemeUtil.setTheme(this)
+
         settingsViewModel.settings.loadSettings()
+
         super.onCreate(savedInstanceState)
-        secondaryDisplay = SecondaryDisplay(this)
-        secondaryDisplay.updateDisplay()
 
         binding = ActivityEmulationBinding.inflate(layoutInflater)
         screenAdjustmentUtil = ScreenAdjustmentUtil(this, windowManager, settingsViewModel.settings)
@@ -109,26 +98,18 @@ class EmulationActivity : AppCompatActivity() {
             windowManager.defaultDisplay.rotation
         )
 
-        EmulationLifecycleUtil.addShutdownHook(onShutdown)
+        EmulationLifecycleUtil.addShutdownHook(hook = {
+            if (intent.getBooleanExtra("launched_from_shortcut", false)) {
+                finishAffinity()
+            } else {
+                this.finish()
+            }
+        })
 
         isEmulationRunning = true
         instance = this
 
         applyOrientationSettings() // Check for orientation settings at startup
-
-        val game = try {
-            intent.extras?.let { extras ->
-                BundleCompat.getParcelable(extras, "game", Game::class.java)
-            } ?: run {
-                Log.error("[EmulationActivity] Missing game data in intent extras")
-                return
-            }
-        } catch (e: Exception) {
-            Log.error("[EmulationActivity] Failed to retrieve game data: ${e.message}")
-            return
-        }
-
-        NativeLibrary.playTimeManagerStart(game.titleId)
     }
 
     // On some devices, the system bars will not disappear on first boot or after some
@@ -140,11 +121,6 @@ class EmulationActivity : AppCompatActivity() {
         applyOrientationSettings() // Check for orientation settings changes on runtime
     }
 
-    override fun onStop() {
-        secondaryDisplay.releasePresentation()
-        super.onStop()
-    }
-
     override fun onWindowFocusChanged(hasFocus: Boolean) {
         super.onWindowFocusChanged(hasFocus)
         enableFullscreenImmersive()
@@ -152,7 +128,6 @@ class EmulationActivity : AppCompatActivity() {
 
     public override fun onRestart() {
         super.onRestart()
-        secondaryDisplay.updateDisplay()
         NativeLibrary.reloadCameraDevices()
     }
 
@@ -167,13 +142,9 @@ class EmulationActivity : AppCompatActivity() {
     }
 
     override fun onDestroy() {
-        EmulationLifecycleUtil.removeHook(onShutdown)
+        EmulationLifecycleUtil.clear()
-        NativeLibrary.playTimeManagerStop()
         isEmulationRunning = false
         instance = null
-        secondaryDisplay.releasePresentation()
-        secondaryDisplay.releaseVD()
-
         super.onDestroy()
     }
 
@@ -267,26 +238,20 @@ class EmulationActivity : AppCompatActivity() {
             preferences.getInt(InputBindingSetting.getInputButtonKey(event.keyCode), event.keyCode)
         val action: Int = when (event.action) {
             KeyEvent.ACTION_DOWN -> {
-                hotkeyUtility.handleHotkey(button)
-
                 // On some devices, the back gesture / button press is not intercepted by androidx
                 // and fails to open the emulation menu. So we're stuck running deprecated code to
                 // cover for either a fault on androidx's side or in OEM skins (MIUI at least)
                 if (event.keyCode == KeyEvent.KEYCODE_BACK) {
-                    // If the hotkey is pressed, we don't want to open the drawer
-                    if (!hotkeyUtility.HotkeyIsPressed) {
                     onBackPressed()
                 }
-                }
+
+                hotkeyUtility.handleHotkey(button)
 
                 // Normal key events.
                 NativeLibrary.ButtonState.PRESSED
             }
 
-            KeyEvent.ACTION_UP -> {
+            KeyEvent.ACTION_UP -> NativeLibrary.ButtonState.RELEASED
-                hotkeyUtility.HotkeyIsPressed = false
-                NativeLibrary.ButtonState.RELEASED
-            }
             else -> return false
         }
         val input = event.device

src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.kt

@@ -45,7 +45,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.CoroutineScope
 import org.citra.citra_emu.HomeNavigationDirections
 import org.citra.citra_emu.CitraApplication
-import org.citra.citra_emu.NativeLibrary
 import org.citra.citra_emu.R
 import org.citra.citra_emu.adapters.GameAdapter.GameViewHolder
 import org.citra.citra_emu.databinding.CardGameBinding
@@ -343,9 +342,8 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
         bottomSheetView.findViewById<TextView>(R.id.about_game_title).text = game.title
         bottomSheetView.findViewById<TextView>(R.id.about_game_company).text = game.company
         bottomSheetView.findViewById<TextView>(R.id.about_game_region).text = game.regions
-        bottomSheetView.findViewById<TextView>(R.id.about_game_id).text = context.getString(R.string.game_context_id) + " " + String.format("%016X", game.titleId)
+        bottomSheetView.findViewById<TextView>(R.id.about_game_id).text = "ID: " + String.format("%016X", game.titleId)
-        bottomSheetView.findViewById<TextView>(R.id.about_game_filename).text = context.getString(R.string.game_context_file) + " " + game.filename
+        bottomSheetView.findViewById<TextView>(R.id.about_game_filename).text = "File: " + game.filename
-        bottomSheetView.findViewById<TextView>(R.id.about_game_filetype).text = context.getString(R.string.game_context_type) + " " + game.fileType
         GameIconUtils.loadGameIcon(activity, game, bottomSheetView.findViewById(R.id.game_icon))
 
         bottomSheetView.findViewById<MaterialButton>(R.id.about_game_play).setOnClickListener {
@@ -353,24 +351,6 @@ class GameAdapter(private val activity: AppCompatActivity, private val inflater:
             view.findNavController().navigate(action)
         }
 
-        bottomSheetView.findViewById<TextView>(R.id.about_game_playtime).text =
-            buildString {
-                val playTimeSeconds = NativeLibrary.playTimeManagerGetPlayTime(game.titleId)
-
-                val hours = playTimeSeconds / 3600
-                val minutes = (playTimeSeconds % 3600) / 60
-                val seconds = playTimeSeconds % 60
-
-                val readablePlayTime = when {
-                    hours > 0 -> "${hours}h ${minutes}m ${seconds}s"
-                    minutes > 0 -> "${minutes}m ${seconds}s"
-                    else -> "${seconds}s"
-                }
-
-                append("Playtime: ")
-                append(readablePlayTime)
-            }
-
         bottomSheetView.findViewById<MaterialButton>(R.id.game_shortcut).setOnClickListener {
             val preferences = PreferenceManager.getDefaultSharedPreferences(context)
 

src/android/app/src/main/java/org/citra/citra_emu/display/ScreenLayout.kt

@@ -50,17 +50,3 @@ enum class PortraitScreenLayout(val int: Int) {
         }
     }
 }
-
-enum class SecondaryDisplayLayout(val int: Int) {
-    // These must match what is defined in src/common/settings.h
-    NONE(0),
-    TOP_SCREEN(1),
-    BOTTOM_SCREEN(2),
-    SIDE_BY_SIDE(3);
-
-    companion object {
-        fun from(int: Int): SecondaryDisplayLayout {
-            return entries.firstOrNull { it.int == int } ?: NONE
-        }
-    }
-}

src/android/app/src/main/java/org/citra/citra_emu/display/SecondaryDisplay.kt

@@ -1,169 +0,0 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-package org.citra.citra_emu.display
-
-import android.app.Presentation
-import android.content.Context
-import android.graphics.SurfaceTexture
-import android.hardware.display.DisplayManager
-import android.hardware.display.VirtualDisplay
-import android.os.Bundle
-import android.view.Display
-import android.view.MotionEvent
-import android.view.Surface
-import android.view.SurfaceHolder
-import android.view.SurfaceView
-import android.view.WindowManager
-import org.citra.citra_emu.features.settings.model.IntSetting
-import org.citra.citra_emu.display.SecondaryDisplayLayout
-import org.citra.citra_emu.NativeLibrary
-
-class SecondaryDisplay(val context: Context) : DisplayManager.DisplayListener {
-    private var pres: SecondaryDisplayPresentation? = null
-    private val displayManager = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
-    private val vd: VirtualDisplay
-
-    init {
-        vd = displayManager.createVirtualDisplay(
-            "HiddenDisplay",
-            1920,
-            1080,
-            320,
-            null,
-            DisplayManager.VIRTUAL_DISPLAY_FLAG_PRESENTATION
-        )
-        displayManager.registerDisplayListener(this, null)
-    }
-
-    fun updateSurface() {
-        NativeLibrary.secondarySurfaceChanged(pres!!.getSurfaceHolder().surface)
-    }
-
-    fun destroySurface() {
-        NativeLibrary.secondarySurfaceDestroyed()
-    }
-
-    private fun getExternalDisplay(context: Context): Display? {
-        val dm = context.getSystemService(Context.DISPLAY_SERVICE) as DisplayManager
-        val internalId = context.display.displayId ?: Display.DEFAULT_DISPLAY
-        val displays = dm.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION)
-        return displays.firstOrNull { it.displayId != internalId && it.name != "HiddenDisplay" }
-    }
-
-    fun updateDisplay() {
-        // decide if we are going to the external display or the internal one
-        var display = getExternalDisplay(context)
-        if (display == null ||
-            IntSetting.SECONDARY_DISPLAY_LAYOUT.int == SecondaryDisplayLayout.NONE.int) {
-            display = vd.display
-        }
-
-        // if our presentation is already on the right display, ignore
-        if (pres?.display == display) return
-
-        // otherwise, make a new presentation
-        releasePresentation()
-        pres = SecondaryDisplayPresentation(context, display!!, this)
-        pres?.show()
-    }
-
-    fun releasePresentation() {
-        pres?.dismiss()
-        pres = null
-    }
-
-    fun releaseVD() {
-        displayManager.unregisterDisplayListener(this)
-        vd.release()
-    }
-
-    override fun onDisplayAdded(displayId: Int) {
-        updateDisplay()
-    }
-
-    override fun onDisplayRemoved(displayId: Int) {
-        updateDisplay()
-    }
-    override fun onDisplayChanged(displayId: Int) {
-        updateDisplay()
-    }
-}
-class SecondaryDisplayPresentation(
-    context: Context, display: Display, val parent: SecondaryDisplay
-) : Presentation(context, display) {
-    private lateinit var surfaceView: SurfaceView
-    private var touchscreenPointerId = -1
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        window?.setFlags(
-            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
-                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL,
-            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or
-                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
-        )
-
-        // Initialize SurfaceView
-        surfaceView = SurfaceView(context)
-        surfaceView.holder.addCallback(object : SurfaceHolder.Callback {
-            override fun surfaceCreated(holder: SurfaceHolder) {
-
-            }
-
-            override fun surfaceChanged(
-                holder: SurfaceHolder, format: Int, width: Int, height: Int
-            ) {
-                parent.updateSurface()
-            }
-
-            override fun surfaceDestroyed(holder: SurfaceHolder) {
-                parent.destroySurface()
-            }
-        })
-
-        this.surfaceView.setOnTouchListener { _, event ->
-
-            val pointerIndex = event.actionIndex
-            val pointerId = event.getPointerId(pointerIndex)
-            when (event.actionMasked) {
-                MotionEvent.ACTION_DOWN, MotionEvent.ACTION_POINTER_DOWN -> {
-                    if (touchscreenPointerId == -1) {
-                        touchscreenPointerId = pointerId
-                        NativeLibrary.onSecondaryTouchEvent(
-                            event.getX(pointerIndex),
-                            event.getY(pointerIndex),
-                            true
-                        )
-                    }
-                }
-
-                MotionEvent.ACTION_MOVE -> {
-                    val index = event.findPointerIndex(touchscreenPointerId)
-                    if (index != -1) {
-                        NativeLibrary.onSecondaryTouchMoved(
-                            event.getX(index),
-                            event.getY(index)
-                        )
-                    }
-                }
-
-                MotionEvent.ACTION_UP, MotionEvent.ACTION_POINTER_UP, MotionEvent.ACTION_CANCEL -> {
-                    if (pointerId == touchscreenPointerId) {
-                        NativeLibrary.onSecondaryTouchEvent(0f, 0f, false)
-                        touchscreenPointerId = -1
-                    }
-                }
-            }
-            true
-        }
-
-        setContentView(surfaceView) // Set SurfaceView as content
-    }
-
-    // Publicly accessible method to get the SurfaceHolder
-    fun getSurfaceHolder(): SurfaceHolder {
-        return surfaceView.holder
-    }
-}

src/android/app/src/main/java/org/citra/citra_emu/features/hotkeys/HotkeyUtility.kt

@@ -17,7 +17,6 @@ class HotkeyUtility(
     private val context: Context) {
 
     private val hotkeyButtons = Hotkey.entries.map { it.button }
-    var HotkeyIsPressed = false
 
     fun handleHotkey(bindedButton: Int): Boolean {
         if(hotkeyButtons.contains(bindedButton)) {
@@ -46,7 +45,6 @@ class HotkeyUtility(
                 }
                 else -> {}
             }
-            HotkeyIsPressed = true
             return true
         }
         return false

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.kt

@@ -19,14 +19,13 @@ enum class BooleanSetting(
     INSTANT_DEBUG_LOG("instant_debug_log", Settings.SECTION_DEBUG, false),
     ENABLE_RPC_SERVER("enable_rpc_server", Settings.SECTION_DEBUG, false),
     CUSTOM_LAYOUT("custom_layout",Settings.SECTION_LAYOUT,false),
-    PERF_OVERLAY_ENABLE("performance_overlay_enable", Settings.SECTION_LAYOUT, false),
+    OVERLAY_SHOW_FPS("overlay_show_fps", Settings.SECTION_LAYOUT, true),
-    PERF_OVERLAY_SHOW_FPS("performance_overlay_show_fps", Settings.SECTION_LAYOUT, true),
+    OVERLAY_SHOW_FRAMETIME("overlay_show_frame_time", Settings.SECTION_LAYOUT, false),
-    PERF_OVERLAY_SHOW_FRAMETIME("performance_overlay_show_frame_time", Settings.SECTION_LAYOUT, false),
+    OVERLAY_SHOW_SPEED("overlay_show_speed", Settings.SECTION_LAYOUT, false),
-    PERF_OVERLAY_SHOW_SPEED("performance_overlay_show_speed", Settings.SECTION_LAYOUT, false),
+    OVERLAY_SHOW_APP_RAM_USAGE("overlay_show_app_ram_usage", Settings.SECTION_LAYOUT, false),
-    PERF_OVERLAY_SHOW_APP_RAM_USAGE("performance_overlay_show_app_ram_usage", Settings.SECTION_LAYOUT, false),
+    OVERLAY_SHOW_AVAILABLE_RAM("overlay_show_available_ram", Settings.SECTION_LAYOUT, false),
-    PERF_OVERLAY_SHOW_AVAILABLE_RAM("performance_overlay_show_available_ram", Settings.SECTION_LAYOUT, false),
+    OVERLAY_SHOW_BATTERY_TEMP("overlay_show_battery_temp", Settings.SECTION_LAYOUT, false),
-    PERF_OVERLAY_SHOW_BATTERY_TEMP("performance_overlay_show_battery_temp", Settings.SECTION_LAYOUT, false),
+    OVERLAY_BACKGROUND("overlay_background", Settings.SECTION_LAYOUT, false),
-    PERF_OVERLAY_BACKGROUND("performance_overlay_background", Settings.SECTION_LAYOUT, false),
     DELAY_START_LLE_MODULES("delay_start_for_lle_modules", Settings.SECTION_DEBUG, true),
     DETERMINISTIC_ASYNC_OPERATIONS("deterministic_async_operations", Settings.SECTION_DEBUG, false),
     REQUIRED_ONLINE_LLE_MODULES("enable_required_online_lle_modules", Settings.SECTION_SYSTEM, false),
@@ -49,9 +48,7 @@ enum class BooleanSetting(
     DEBUG_RENDERER("renderer_debug", Settings.SECTION_DEBUG, false),
     DISABLE_RIGHT_EYE_RENDER("disable_right_eye_render", Settings.SECTION_RENDERER, false),
     USE_ARTIC_BASE_CONTROLLER("use_artic_base_controller", Settings.SECTION_CONTROLS, false),
-    UPRIGHT_SCREEN("upright_screen", Settings.SECTION_LAYOUT, false),
+    UPRIGHT_SCREEN("upright_screen", Settings.SECTION_LAYOUT, false);
-    COMPRESS_INSTALLED_CIA_CONTENT("compress_cia_installs", Settings.SECTION_STORAGE, false),
-    ANDROID_HIDE_IMAGES("android_hide_images", Settings.SECTION_CORE, false);
 
     override var boolean: Boolean = defaultValue
 
@@ -83,10 +80,7 @@ enum class BooleanSetting(
             CPU_JIT,
             ASYNC_CUSTOM_LOADING,
             SHADERS_ACCURATE_MUL,
-            USE_ARTIC_BASE_CONTROLLER,
+            USE_ARTIC_BASE_CONTROLLER
-            COMPRESS_INSTALLED_CIA_CONTENT,
-            ANDROID_HIDE_IMAGES,
-            PERF_OVERLAY_ENABLE // Works in overlay options, but not from the settings menu
         )
 
         fun from(key: String): BooleanSetting? =

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/FloatSetting.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright Citra Emulator Project / Lime3DS Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -10,10 +10,6 @@ enum class FloatSetting(
     override val defaultValue: Float
 ) : AbstractFloatSetting {
     LARGE_SCREEN_PROPORTION("large_screen_proportion",Settings.SECTION_LAYOUT,2.25f),
-    SECOND_SCREEN_OPACITY("custom_second_layer_opacity", Settings.SECTION_RENDERER, 100f),
-    BACKGROUND_RED("bg_red", Settings.SECTION_RENDERER, 0f),
-    BACKGROUND_BLUE("bg_blue", Settings.SECTION_RENDERER, 0f),
-    BACKGROUND_GREEN("bg_green", Settings.SECTION_RENDERER, 0f),
     EMPTY_SETTING("", "", 0.0f);
 
     override var float: Float = defaultValue

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.kt

@@ -35,7 +35,6 @@ enum class IntSetting(
     LANDSCAPE_BOTTOM_HEIGHT("custom_bottom_height",Settings.SECTION_LAYOUT,480),
     SCREEN_GAP("screen_gap",Settings.SECTION_LAYOUT,0),
     PORTRAIT_SCREEN_LAYOUT("portrait_layout_option",Settings.SECTION_LAYOUT,0),
-    SECONDARY_DISPLAY_LAYOUT("secondary_display_layout",Settings.SECTION_LAYOUT,0),
     PORTRAIT_TOP_X("custom_portrait_top_x",Settings.SECTION_LAYOUT,0),
     PORTRAIT_TOP_Y("custom_portrait_top_y",Settings.SECTION_LAYOUT,0),
     PORTRAIT_TOP_WIDTH("custom_portrait_top_width",Settings.SECTION_LAYOUT,800),

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Settings.kt

@@ -112,7 +112,6 @@ class Settings {
         const val SECTION_CUSTOM_LANDSCAPE = "Custom Landscape Layout"
         const val SECTION_CUSTOM_PORTRAIT = "Custom Portrait Layout"
         const val SECTION_PERFORMANCE_OVERLAY = "Performance Overlay"
-        const val SECTION_STORAGE = "Storage"
 
         const val KEY_BUTTON_A = "button_a"
         const val KEY_BUTTON_B = "button_b"
@@ -238,7 +237,6 @@ class Settings {
                     SECTION_CONTROLS,
                     SECTION_RENDERER,
                     SECTION_LAYOUT,
-                    SECTION_STORAGE,
                     SECTION_UTILITY,
                     SECTION_AUDIO,
                     SECTION_DEBUG

src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright Citra Emulator Project / Lime3DS Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -10,6 +10,7 @@ import org.citra.citra_emu.features.settings.model.AbstractSetting
 import org.citra.citra_emu.features.settings.model.FloatSetting
 import org.citra.citra_emu.features.settings.model.ScaledFloatSetting
 import org.citra.citra_emu.utils.Log
+import kotlin.math.roundToInt
 
 class SliderSetting(
     setting: AbstractSetting?,
@@ -26,8 +27,7 @@ class SliderSetting(
     val selectedFloat: Float
         get() {
             val setting = setting ?: return defaultValue!!.toFloat()
-
+            return when (setting) {
-            val ret = when (setting) {
                 is AbstractIntSetting -> setting.int.toFloat()
                 is FloatSetting -> setting.float
                 is ScaledFloatSetting -> setting.float
@@ -36,8 +36,8 @@ class SliderSetting(
                     -1f
                 }
             }
-            return ret.coerceIn(min.toFloat(), max.toFloat())
         }
+
     /**
      * Write a value to the backing int. If that int was previously null,
      * initializes a new one and returns it, so it can be added to the Hashmap.

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.kt

@@ -4,19 +4,14 @@
 
 package org.citra.citra_emu.features.settings.ui
 
-import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
-import androidx.documentfile.provider.DocumentFile
-import org.citra.citra_emu.CitraApplication
 import org.citra.citra_emu.NativeLibrary
-import org.citra.citra_emu.features.settings.model.BooleanSetting
+import org.citra.citra_emu.features.settings.model.IntSetting
 import org.citra.citra_emu.features.settings.model.Settings
 import org.citra.citra_emu.utils.SystemSaveGame
 import org.citra.citra_emu.utils.DirectoryInitialization
-import org.citra.citra_emu.utils.FileUtil
 import org.citra.citra_emu.utils.Log
-import org.citra.citra_emu.utils.PermissionsHandler
 import org.citra.citra_emu.utils.TurboHelper
 
 class SettingsActivityPresenter(private val activityView: SettingsActivityView) {
@@ -65,32 +60,6 @@ class SettingsActivityPresenter(private val activityView: SettingsActivityView)
         loadSettingsUI()
     }
 
-    private fun updateAndroidImageVisibility() {
-        val dataDirTreeUri: Uri
-        val dataDirDocument: DocumentFile
-        val nomediaFileDocument: DocumentFile?
-        val nomediaFileExists: Boolean
-        try {
-            dataDirTreeUri = PermissionsHandler.citraDirectory
-            dataDirDocument = DocumentFile.fromTreeUri(CitraApplication.appContext, dataDirTreeUri)!!
-            nomediaFileDocument = dataDirDocument.findFile(".nomedia")
-            nomediaFileExists = (nomediaFileDocument != null)
-        } catch (e: Exception) {
-            Log.error("[SettingsActivity]: Error occurred while trying to find .nomedia, error: " + e.message)
-            return
-        }
-
-        if (BooleanSetting.ANDROID_HIDE_IMAGES.boolean) {
-            if (!nomediaFileExists) {
-                Log.info("[SettingsActivity]: Attempting to create .nomedia in user data directory")
-                FileUtil.createFile(dataDirTreeUri.toString(), ".nomedia")
-            }
-        } else if (nomediaFileExists) {
-            Log.info("[SettingsActivity]: Attempting to delete .nomedia in user data directory")
-            nomediaFileDocument!!.delete()
-        }
-    }
-
     fun onStop(finishing: Boolean) {
         if (finishing && shouldSave) {
             Log.debug("[SettingsActivity] Settings activity stopping. Saving settings to INI...")
@@ -98,7 +67,6 @@ class SettingsActivityPresenter(private val activityView: SettingsActivityView)
             //added to ensure that layout changes take effect as soon as settings window closes
             NativeLibrary.reloadSettings()
             NativeLibrary.updateFramebuffer(NativeLibrary.isPortraitMode)
-            updateAndroidImageVisibility()
             TurboHelper.reloadTurbo(false) // TODO: Can this go somewhere else? -OS
         }
         NativeLibrary.reloadSettings()

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -14,8 +14,11 @@ import android.os.Build
 import android.text.TextUtils
 import androidx.preference.PreferenceManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import kotlin.math.min
 import org.citra.citra_emu.CitraApplication
 import org.citra.citra_emu.R
+import org.citra.citra_emu.display.PortraitScreenLayout
+import org.citra.citra_emu.display.ScreenLayout
 import org.citra.citra_emu.features.settings.model.AbstractBooleanSetting
 import org.citra.citra_emu.features.settings.model.AbstractIntSetting
 import org.citra.citra_emu.features.settings.model.AbstractSetting
@@ -248,15 +251,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.TURBO_LIMIT.defaultValue.toFloat()
                 )
             )
-            add(
-                SwitchSetting(
-                    BooleanSetting.ANDROID_HIDE_IMAGES,
-                    R.string.android_hide_images,
-                    R.string.android_hide_images_description,
-                    BooleanSetting.ANDROID_HIDE_IMAGES.key,
-                    BooleanSetting.ANDROID_HIDE_IMAGES.defaultValue
-                )
-            )
         }
     }
 
@@ -571,16 +565,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     BooleanSetting.ALLOW_PLUGIN_LOADER.defaultValue
                 )
             )
-            add(HeaderSetting(R.string.storage))
-            add(
-                SwitchSetting(
-                    BooleanSetting.COMPRESS_INSTALLED_CIA_CONTENT,
-                    R.string.compress_cia_installs,
-                    R.string.compress_cia_installs_description,
-                    BooleanSetting.COMPRESS_INSTALLED_CIA_CONTENT.key,
-                    BooleanSetting.COMPRESS_INSTALLED_CIA_CONTENT.defaultValue
-                )
-            )
         }
     }
 
@@ -1117,17 +1101,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.PORTRAIT_SCREEN_LAYOUT.defaultValue
                 )
             )
-            add(
-                SingleChoiceSetting(
-                    IntSetting.SECONDARY_DISPLAY_LAYOUT,
-                    R.string.emulation_switch_secondary_layout,
-                    R.string.emulation_switch_secondary_layout_description,
-                    R.array.secondaryLayouts,
-                    R.array.secondaryLayoutValues,
-                    IntSetting.SECONDARY_DISPLAY_LAYOUT.key,
-                    IntSetting.SECONDARY_DISPLAY_LAYOUT.defaultValue
-                )
-            )
             add(
                 SingleChoiceSetting(
                     IntSetting.ASPECT_RATIO,
@@ -1175,89 +1148,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     FloatSetting.LARGE_SCREEN_PROPORTION.defaultValue
                 )
             )
-            add(
-                SliderSetting(
-                    FloatSetting.SECOND_SCREEN_OPACITY,
-                    R.string.second_screen_opacity,
-                    R.string.second_screen_opacity_description,
-                    0,
-                    100,
-                    "%",
-                    FloatSetting.SECOND_SCREEN_OPACITY.key,
-                    FloatSetting.SECOND_SCREEN_OPACITY.defaultValue,
-                    isEnabled = IntSetting.SCREEN_LAYOUT.int == 5
-                )
-            )
-            add(HeaderSetting(R.string.bg_color, R.string.bg_color_description))
-            val bgRedSetting = object : AbstractIntSetting {
-                override var int: Int
-                    get() = (FloatSetting.BACKGROUND_RED.float * 255).toInt()
-                    set(value) {
-                        FloatSetting.BACKGROUND_RED.float = value.toFloat() / 255
-                        settings.saveSetting(FloatSetting.BACKGROUND_RED, SettingsFile.FILE_NAME_CONFIG)
-                    }
-                override val key = null
-                override val section = null
-                override val isRuntimeEditable = false
-                override val valueAsString = int.toString()
-                override val defaultValue = FloatSetting.BACKGROUND_RED.defaultValue
-            }
-            add(
-                SliderSetting(
-                    bgRedSetting,
-                    R.string.bg_red,
-                    0,
-                    0,
-                    255,
-                    ""
-                )
-            )
-            val bgGreenSetting = object : AbstractIntSetting {
-                override var int: Int
-                    get() = (FloatSetting.BACKGROUND_GREEN.float * 255).toInt()
-                    set(value) {
-                        FloatSetting.BACKGROUND_GREEN.float = value.toFloat() / 255
-                        settings.saveSetting(FloatSetting.BACKGROUND_GREEN, SettingsFile.FILE_NAME_CONFIG)
-                    }
-                override val key = null
-                override val section = null
-                override val isRuntimeEditable = false
-                override val valueAsString = int.toString()
-                override val defaultValue = FloatSetting.BACKGROUND_GREEN.defaultValue
-            }
-            add(
-                SliderSetting(
-                    bgGreenSetting,
-                    R.string.bg_green,
-                    0,
-                    0,
-                    255,
-                    ""
-                )
-            )
-            val bgBlueSetting = object : AbstractIntSetting {
-                override var int: Int
-                    get() = (FloatSetting.BACKGROUND_BLUE.float * 255).toInt()
-                    set(value) {
-                        FloatSetting.BACKGROUND_BLUE.float = value.toFloat() / 255
-                        settings.saveSetting(FloatSetting.BACKGROUND_BLUE, SettingsFile.FILE_NAME_CONFIG)
-                    }
-                override val key = null
-                override val section = null
-                override val isRuntimeEditable = false
-                override val valueAsString = int.toString()
-                override val defaultValue = FloatSetting.BACKGROUND_BLUE.defaultValue
-            }
-            add(
-                SliderSetting(
-                    bgBlueSetting,
-                    R.string.bg_blue,
-                    0,
-                    0,
-                    255,
-                    ""
-                )
-            )
             add(
                 SubmenuSetting(
                     R.string.performance_overlay_options,
@@ -1293,29 +1183,38 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
 
             add(
                 SwitchSetting(
-                    BooleanSetting.PERF_OVERLAY_ENABLE,
+                    object : AbstractBooleanSetting {
+                        override val key = "EmulationMenuSettings_showPerfPerformanceOverlay"
+                        override val section = Settings.SECTION_LAYOUT
+                        override val defaultValue = false
+                        override var boolean: Boolean
+                            get() = EmulationMenuSettings.showPerformanceOverlay
+                            set(value) { EmulationMenuSettings.showPerformanceOverlay = value }
+                        override val isRuntimeEditable = true
+                        override val valueAsString: String get() = boolean.toString()
+                    },
                     R.string.performance_overlay_enable,
                     0,
-                    BooleanSetting.PERF_OVERLAY_ENABLE.key,
+                    "EmulationMenuSettings_showPerfPerformanceOverlay",
-                    BooleanSetting.PERF_OVERLAY_ENABLE.defaultValue
+                    false
                 )
             )
 
             add(
                 SwitchSetting(
-                    BooleanSetting.PERF_OVERLAY_BACKGROUND,
+                    BooleanSetting.OVERLAY_BACKGROUND,
-                    R.string.performance_overlay_background,
+                    R.string.overlay_background,
-                    R.string.performance_overlay_background_description,
+                    R.string.overlay_background_description,
-                    BooleanSetting.PERF_OVERLAY_BACKGROUND.key,
+                    "overlay_background",
-                    BooleanSetting.PERF_OVERLAY_BACKGROUND.defaultValue
+                    false
                 )
             )
 
             add(
                 SingleChoiceSetting(
                     IntSetting.PERFORMANCE_OVERLAY_POSITION,
-                    R.string.performance_overlay_position,
+                    R.string.overlay_position,
-                    R.string.performance_overlay_position_description,
+                    R.string.overlay_position_description,
                     R.array.statsPosition,
                     R.array.statsPositionValues,
                 )
@@ -1326,61 +1225,61 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
 
             add(
                 SwitchSetting(
-                    BooleanSetting.PERF_OVERLAY_SHOW_FPS,
+                    BooleanSetting.OVERLAY_SHOW_FPS,
-                    R.string.performance_overlay_show_fps,
+                    R.string.overlay_show_fps,
-                    R.string.performance_overlay_show_fps_description,
+                    R.string.overlay_show_fps_description,
-                    BooleanSetting.PERF_OVERLAY_SHOW_FPS.key,
+                    "overlay_show_fps",
-                    BooleanSetting.PERF_OVERLAY_SHOW_FPS.defaultValue
+                    true
                 )
             )
 
             add(
                 SwitchSetting(
-                    BooleanSetting.PERF_OVERLAY_SHOW_FRAMETIME,
+                    BooleanSetting.OVERLAY_SHOW_FRAMETIME,
-                    R.string.performance_overlay_show_frametime,
+                    R.string.overlay_show_frametime,
-                    R.string.performance_overlay_show_frametime_description,
+                    R.string.overlay_show_frametime_description,
-                    BooleanSetting.PERF_OVERLAY_SHOW_FRAMETIME.key,
+                    "overlay_show_frame_time",
-                    BooleanSetting.PERF_OVERLAY_SHOW_FRAMETIME.defaultValue
+                    true
                 )
             )
 
             add(
                 SwitchSetting(
-                    BooleanSetting.PERF_OVERLAY_SHOW_SPEED,
+                    BooleanSetting.OVERLAY_SHOW_SPEED,
-                    R.string.performance_overlay_show_speed,
+                    R.string.overlay_show_speed,
-                    R.string.performance_overlay_show_speed_description,
+                    R.string.overlay_show_speed_description,
-                    BooleanSetting.PERF_OVERLAY_SHOW_SPEED.key,
+                    "overlay_show_speed",
-                    BooleanSetting.PERF_OVERLAY_SHOW_SPEED.defaultValue
+                    false
                 )
             )
 
             add(
                 SwitchSetting(
-                    BooleanSetting.PERF_OVERLAY_SHOW_APP_RAM_USAGE,
+                    BooleanSetting.OVERLAY_SHOW_APP_RAM_USAGE,
-                    R.string.performance_overlay_show_app_ram_usage,
+                    R.string.overlay_show_app_ram_usage,
-                    R.string.performance_overlay_show_app_ram_usage_description,
+                    R.string.overlay_show_app_ram_usage_description,
-                    BooleanSetting.PERF_OVERLAY_SHOW_APP_RAM_USAGE.key,
+                    "overlay_show_app_ram_usage",
-                    BooleanSetting.PERF_OVERLAY_SHOW_APP_RAM_USAGE.defaultValue
+                    false
                 )
             )
 
             add(
                 SwitchSetting(
-                    BooleanSetting.PERF_OVERLAY_SHOW_AVAILABLE_RAM,
+                    BooleanSetting.OVERLAY_SHOW_AVAILABLE_RAM,
-                    R.string.performance_overlay_show_available_ram,
+                    R.string.overlay_show_available_ram,
-                    R.string.performance_overlay_show_available_ram_description,
+                    R.string.overlay_show_available_ram_description,
-                    BooleanSetting.PERF_OVERLAY_SHOW_AVAILABLE_RAM.key,
+                    "overlay_show_available_ram",
-                    BooleanSetting.PERF_OVERLAY_SHOW_AVAILABLE_RAM.defaultValue
+                    false
                 )
             )
 
             add(
                 SwitchSetting(
-                    BooleanSetting.PERF_OVERLAY_SHOW_BATTERY_TEMP,
+                    BooleanSetting.OVERLAY_SHOW_BATTERY_TEMP,
-                    R.string.performance_overlay_show_battery_temp,
+                    R.string.overlay_show_battery_temp,
-                    R.string.performance_overlay_show_battery_temp_description,
+                    R.string.overlay_show_battery_temp_description,
-                    BooleanSetting.PERF_OVERLAY_SHOW_BATTERY_TEMP.key,
+                    "overlay_show_battery_temp",
-                    BooleanSetting.PERF_OVERLAY_SHOW_BATTERY_TEMP.defaultValue
+                    false
                 )
             )
         }

src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.kt

@@ -66,7 +66,6 @@ import org.citra.citra_emu.display.ScreenAdjustmentUtil
 import org.citra.citra_emu.display.ScreenLayout
 import org.citra.citra_emu.features.settings.model.BooleanSetting
 import org.citra.citra_emu.features.settings.model.IntSetting
-import org.citra.citra_emu.features.settings.model.Settings
 import org.citra.citra_emu.features.settings.model.SettingsViewModel
 import org.citra.citra_emu.features.settings.ui.SettingsActivity
 import org.citra.citra_emu.features.settings.utils.SettingsFile
@@ -101,10 +100,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
 
     private val emulationViewModel: EmulationViewModel by activityViewModels()
     private val settingsViewModel: SettingsViewModel by viewModels()
-    private val settings get() = settingsViewModel.settings
-
-    private val onPause = Runnable{ togglePause() }
-    private val onShutdown = Runnable{ emulationState.stop() }
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -160,9 +155,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
         retainInstance = true
         emulationState = EmulationState(game.path)
         emulationActivity = requireActivity() as EmulationActivity
-        screenAdjustmentUtil = ScreenAdjustmentUtil(requireContext(), requireActivity().windowManager, settings)
+        screenAdjustmentUtil = ScreenAdjustmentUtil(requireContext(), requireActivity().windowManager, settingsViewModel.settings)
-        EmulationLifecycleUtil.addPauseResumeHook(onPause)
+        EmulationLifecycleUtil.addShutdownHook(hook = { emulationState.stop() })
-        EmulationLifecycleUtil.addShutdownHook(onShutdown)
+        EmulationLifecycleUtil.addPauseResumeHook(hook = { togglePause() })
     }
 
     override fun onCreateView(
@@ -360,7 +355,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                 }
 
                 R.id.menu_exit -> {
-                    emulationState.pause()
+                    NativeLibrary.pauseEmulation()
                     MaterialAlertDialogBuilder(requireContext())
                         .setTitle(R.string.emulation_close_game)
                         .setMessage(R.string.emulation_close_game_message)
@@ -368,9 +363,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                             EmulationLifecycleUtil.closeGame()
                         }
                         .setNegativeButton(android.R.string.cancel) { _: DialogInterface?, _: Int ->
-                            emulationState.unpause()
+                            NativeLibrary.unPauseEmulation()
                         }
-                        .setOnCancelListener { emulationState.unpause() }
+                        .setOnCancelListener { NativeLibrary.unPauseEmulation() }
                         .show()
                     true
                 }
@@ -475,7 +470,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
         super.onResume()
         Choreographer.getInstance().postFrameCallback(this)
         if (NativeLibrary.isRunning()) {
-            emulationState.pause()
+            NativeLibrary.unPauseEmulation()
 
             // If the overlay is enabled, we need to update the position if changed
             val position = IntSetting.PERFORMANCE_OVERLAY_POSITION.int
@@ -512,12 +507,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
         super.onDetach()
     }
 
-    override fun onDestroy() {
-        EmulationLifecycleUtil.removeHook(onPause)
-        EmulationLifecycleUtil.removeHook(onShutdown)
-        super.onDestroy()
-    }
-
     private fun setupCitraDirectoriesThenStartEmulation() {
         val directoryInitializationState = DirectoryInitialization.start()
         if (directoryInitializationState ===
@@ -673,7 +662,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
         popupMenu.menu.apply {
             findItem(R.id.menu_show_overlay).isChecked = EmulationMenuSettings.showOverlay
             findItem(R.id.menu_performance_overlay_show).isChecked =
-                BooleanSetting.PERF_OVERLAY_ENABLE.boolean
+                EmulationMenuSettings.showPerformanceOverlay
             findItem(R.id.menu_haptic_feedback).isChecked = EmulationMenuSettings.hapticFeedback
             findItem(R.id.menu_emulation_joystick_rel_center).isChecked =
                 EmulationMenuSettings.joystickRelCenter
@@ -690,8 +679,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                 }
 
                 R.id.menu_performance_overlay_show -> {
-                    BooleanSetting.PERF_OVERLAY_ENABLE.boolean = !BooleanSetting.PERF_OVERLAY_ENABLE.boolean
+                    EmulationMenuSettings.showPerformanceOverlay = !EmulationMenuSettings.showPerformanceOverlay
-                    settings.saveSetting(BooleanSetting.PERF_OVERLAY_ENABLE, SettingsFile.FILE_NAME_CONFIG)
                     updateShowPerformanceOverlay()
                     true
                 }
@@ -808,11 +796,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                     true
                 }
 
-                R.id.menu_emulation_button_sliding -> {
-                    showButtonSlidingMenu()
-                    true
-                }
-
                 R.id.menu_emulation_dpad_slide_enable -> {
                     EmulationMenuSettings.dpadSlide = !EmulationMenuSettings.dpadSlide
                     true
@@ -857,28 +840,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
         popupMenu.show()
     }
 
-    private fun showButtonSlidingMenu() {
-        val editor = preferences.edit()
-
-        val buttonSlidingModes = mutableListOf<String>()
-        buttonSlidingModes.add(getString(R.string.emulation_button_sliding_disabled))
-        buttonSlidingModes.add(getString(R.string.emulation_button_sliding_enabled))
-        buttonSlidingModes.add(getString(R.string.emulation_button_sliding_alternative))
-
-        MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.emulation_button_sliding)
-            .setSingleChoiceItems(
-                buttonSlidingModes.toTypedArray(),
-                EmulationMenuSettings.buttonSlide
-            ) { _: DialogInterface?, which: Int ->
-                EmulationMenuSettings.buttonSlide = which
-            }
-            .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
-                editor.apply()
-            }
-            .show()
-    }
-
     private fun showLandscapeScreenLayoutMenu() {
         val popupMenu = PopupMenu(
             requireContext(),
@@ -1214,7 +1175,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
             perfStatsUpdateHandler.removeCallbacks(perfStatsUpdater!!)
         }
 
-        if (BooleanSetting.PERF_OVERLAY_ENABLE.boolean) {
+        if (EmulationMenuSettings.showPerformanceOverlay) {
             val SYSTEM_FPS = 0
             val FPS = 1
             val SPEED = 2
@@ -1222,25 +1183,23 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
             val TIME_SVC = 4
             val TIME_IPC = 5
             val TIME_GPU = 6
-            val TIME_SWAP = 7
+            val TIME_REM = 7
-            val TIME_REM = 8
             perfStatsUpdater = Runnable {
                 val sb = StringBuilder()
                 val perfStats = NativeLibrary.getPerfStats()
                 val dividerString = "\u00A0\u2502 "
                 if (perfStats[FPS] > 0) {
-                    if (BooleanSetting.PERF_OVERLAY_SHOW_FPS.boolean) {
+                    if (BooleanSetting.OVERLAY_SHOW_FPS.boolean) {
                         sb.append(String.format("FPS:\u00A0%d", (perfStats[FPS] + 0.5).toInt()))
                     }
 
-                    if (BooleanSetting.PERF_OVERLAY_SHOW_FRAMETIME.boolean) {
+                    if (BooleanSetting.OVERLAY_SHOW_FRAMETIME.boolean) {
                         if (sb.isNotEmpty()) sb.append(dividerString)
                         sb.append(
                             String.format(
-                                "Frame:\u00A0%.1fms (GPU: [CMD:\u00A0%.1fms SWP:\u00A0%.1fms] IPC:\u00A0%.1fms SVC:\u00A0%.1fms Rem:\u00A0%.1fms)",
+                                "Frame:\u00A0%.1fms (GPU:\u00A0%.1fms IPC:\u00A0%.1fms SVC:\u00A0%.1fms Rem:\u00A0%.1fms)",
                                 (perfStats[FRAMETIME] * 1000.0f).toFloat(),
                                 (perfStats[TIME_GPU] * 1000.0f).toFloat(),
-                                (perfStats[TIME_SWAP] * 1000.0f).toFloat(),
                                 (perfStats[TIME_IPC] * 1000.0f).toFloat(),
                                 (perfStats[TIME_SVC] * 1000.0f).toFloat(),
                                 (perfStats[TIME_REM] * 1000.0f).toFloat(),
@@ -1248,7 +1207,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                         )
                     }
 
-                    if (BooleanSetting.PERF_OVERLAY_SHOW_SPEED.boolean) {
+                    if (BooleanSetting.OVERLAY_SHOW_SPEED.boolean) {
                         if (sb.isNotEmpty()) sb.append(dividerString)
                         sb.append(
                             String.format(
@@ -1258,14 +1217,14 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                         )
                     }
 
-                    if (BooleanSetting.PERF_OVERLAY_SHOW_APP_RAM_USAGE.boolean) {
+                    if (BooleanSetting.OVERLAY_SHOW_APP_RAM_USAGE.boolean) {
                         if (sb.isNotEmpty()) sb.append(dividerString)
                         val appRamUsage =
                             File("/proc/self/statm").readLines()[0].split(' ')[1].toLong() * 4096 / 1000000
                         sb.append("Process\u00A0RAM:\u00A0$appRamUsage\u00A0MB")
                     }
 
-                    if (BooleanSetting.PERF_OVERLAY_SHOW_AVAILABLE_RAM.boolean) {
+                    if (BooleanSetting.OVERLAY_SHOW_AVAILABLE_RAM.boolean) {
                         if (sb.isNotEmpty()) sb.append(dividerString)
                         context?.let { ctx ->
                             val activityManager =
@@ -1278,14 +1237,14 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                         }
                     }
 
-                    if (BooleanSetting.PERF_OVERLAY_SHOW_BATTERY_TEMP.boolean) {
+                    if (BooleanSetting.OVERLAY_SHOW_BATTERY_TEMP.boolean) {
                         if (sb.isNotEmpty()) sb.append(dividerString)
                         val batteryTemp = getBatteryTemperature()
                         val tempF = celsiusToFahrenheit(batteryTemp)
                         sb.append(String.format("%.1f°C/%.1f°F", batteryTemp, tempF))
                     }
 
-                    if (BooleanSetting.PERF_OVERLAY_BACKGROUND.boolean) {
+                    if (BooleanSetting.OVERLAY_BACKGROUND.boolean) {
                         binding.performanceOverlayShowText.setBackgroundResource(R.color.citra_transparent_black)
                     } else {
                         binding.performanceOverlayShowText.setBackgroundResource(0)
@@ -1434,7 +1393,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                 // Release the surface before pausing, since emulation has to be running for that.
                 NativeLibrary.surfaceDestroyed()
                 NativeLibrary.pauseEmulation()
-                NativeLibrary.playTimeManagerStop()
             } else {
                 Log.warning("[EmulationFragment] Pause called while already paused.")
             }
@@ -1447,7 +1405,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
                 Log.debug("[EmulationFragment] Unpausing emulation.")
 
                 NativeLibrary.unPauseEmulation()
-                NativeLibrary.playTimeManagerStart(NativeLibrary.playTimeManagerGetCurrentTitleId())
             } else {
                 Log.warning("[EmulationFragment] Unpause called while already running.")
             }
@@ -1514,7 +1471,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback, Choreographer.Fram
 
                 State.PAUSED -> {
                     Log.debug("[EmulationFragment] Resuming emulation.")
-                    unpause()
+                    NativeLibrary.unPauseEmulation()
                 }
 
                 else -> {

src/android/app/src/main/java/org/citra/citra_emu/model/Game.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright Citra Emulator Project / Lime3DS Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -26,8 +26,7 @@ class Game(
     val isSystemTitle: Boolean = false,
     val isVisibleSystemTitle: Boolean = false,
     val icon: IntArray? = null,
-    val fileType: String = "",
+    val filename: String
-    val filename: String,
 ) : Parcelable {
     val keyAddedToLibraryTime get() = "${filename}_AddedToLibraryTime"
     val keyLastPlayedTime get() = "${filename}_LastPlayed"
@@ -64,7 +63,7 @@ class Game(
         val allExtensions: Set<String> get() = extensions + badExtensions
 
         val extensions: Set<String> = HashSet(
-            listOf("3dsx", "app", "axf", "cci", "cxi", "elf", "z3dsx", "zcci", "zcxi")
+            listOf("3dsx", "elf", "axf", "cci", "cxi", "app")
         )
 
         val badExtensions: Set<String> = HashSet(

src/android/app/src/main/java/org/citra/citra_emu/model/GameInfo.kt

@@ -13,30 +13,25 @@ class GameInfo(path: String) {
 
     init {
         pointer = initialize(path)
+        if (pointer == 0L) {
+            throw IOException()
+        }
     }
 
     protected external fun finalize()
 
     external fun getTitle(): String
 
-    external fun isValid(): Boolean
-
     external fun isEncrypted(): Boolean
 
-    external fun getTitleID(): Long
-
     external fun getRegions(): String
 
     external fun getCompany(): String
 
     external fun getIcon(): IntArray?
 
-    external fun isSystemTitle(): Boolean
-
     external fun getIsVisibleSystemTitle(): Boolean
 
-    external fun getFileType(): String
-
     companion object {
         @JvmStatic
         private external fun initialize(path: String): Long

src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlay.kt

@@ -96,115 +96,28 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex
         if (isInEditMode) {
             return onTouchWhileEditing(event)
         }
-
-        val motionEvent = event.action and MotionEvent.ACTION_MASK
-        val isActionDown =
-            motionEvent == MotionEvent.ACTION_DOWN || motionEvent == MotionEvent.ACTION_POINTER_DOWN
-        val isActionMove = motionEvent == MotionEvent.ACTION_MOVE
-        val isActionUp =
-            motionEvent == MotionEvent.ACTION_UP || motionEvent == MotionEvent.ACTION_POINTER_UP
-
-        val pointerList = (0 until event.pointerCount).toMutableList()
-        // Move the pointer that triggered the most recent event to the front
-        // of the list so that it is processed first
-        val currentActionPointer = event.actionIndex
-        pointerList.remove(pointerList.indexOf(currentActionPointer))
-        pointerList.add(0, currentActionPointer)
-
-        // Set up a loop for if we need to check touches other than the most recent one
-        // (Only happens if we're dragging the touch)
-        for (pointerIndex in pointerList) {
-            val pointerId = event.getPointerId(pointerIndex)
-
-            val xPosition = event.getX(pointerIndex).toInt()
-            val yPosition = event.getY(pointerIndex).toInt()
-
-            var hasActiveButtons = false
-            for (button in overlayButtons) {
-                if (button.trackId == pointerId) {
-                    hasActiveButtons = true
-                    break
-                }
-            }
-
-            var hasActiveDpad = false
-            if (!hasActiveButtons) {
-                for (dpad in overlayDpads) {
-                    if (dpad.trackId == pointerId) {
-                        hasActiveDpad = true
-                        break
-                    }
-                }
-            }
-
-            var hasActiveJoystick = false
-            if(!hasActiveButtons && !hasActiveDpad){
-                for (joystick in overlayJoysticks) {
-                    if (joystick.trackId == pointerId) {
-                        hasActiveJoystick = true
-                        break
-                    }
-                }
-            }
-
-            val hasActiveOverlay = hasActiveButtons || hasActiveDpad || hasActiveJoystick
-
-            if (preferences.getBoolean("isTouchEnabled", true) && !hasActiveOverlay) {
-                if (isActionMove) {
-                    NativeLibrary.onTouchMoved(xPosition.toFloat(), yPosition.toFloat())
-                    continue
-                } else if (isActionUp) {
-                    NativeLibrary.onTouchEvent(0f, 0f, false)
-                    break // Up and down actions shouldn't loop
-                }
-            }
-
-            var anyOverlayStateChanged = false
         var shouldUpdateView = false
-            if(!hasActiveDpad && !hasActiveJoystick) {
         for (button in overlayButtons) {
-                    val stateChanged = button.updateStatus(event, pointerIndex, hasActiveButtons, this)
+            if (!button.updateStatus(event, this)) {
-                    if (!stateChanged) {
                 continue
             }
-                    anyOverlayStateChanged = true
 
             if (button.id == NativeLibrary.ButtonType.BUTTON_SWAP && button.status == NativeLibrary.ButtonState.PRESSED) {
                 swapScreen()
             }
-                    else if (button.id == NativeLibrary.ButtonType.BUTTON_TURBO && button.status == NativeLibrary.ButtonState.PRESSED) {
+
+            if (button.id == NativeLibrary.ButtonType.BUTTON_TURBO && button.status == NativeLibrary.ButtonState.PRESSED) {
                 TurboHelper.toggleTurbo(true)
             }
 
-                    NativeLibrary.onGamePadEvent(
+            NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, button.id, button.status)
-                        NativeLibrary.TouchScreenDevice,
-                        button.id,
-                        button.status
-                    )
-
             shouldUpdateView = true
         }
-            }
-
-            if(!hasActiveButtons && !hasActiveJoystick) {
         for (dpad in overlayDpads) {
-                    val stateChanged = dpad.updateStatus(
+            if (!dpad.updateStatus(event, EmulationMenuSettings.dpadSlide, this)) {
-                        event,
-                        pointerIndex,
-                        hasActiveDpad,
-                        EmulationMenuSettings.dpadSlide,
-                        this
-                    )
-                    if (!stateChanged) {
                 continue
             }
-                    anyOverlayStateChanged = true
+            NativeLibrary.onGamePadEvent(NativeLibrary.TouchScreenDevice, dpad.upId, dpad.upStatus)
-
-                    NativeLibrary.onGamePadEvent(
-                        NativeLibrary.TouchScreenDevice,
-                        dpad.upId,
-                        dpad.upStatus
-                    )
             NativeLibrary.onGamePadEvent(
                 NativeLibrary.TouchScreenDevice,
                 dpad.downId,
@@ -220,19 +133,12 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex
                 dpad.rightId,
                 dpad.rightStatus
             )
-
             shouldUpdateView = true
         }
-            }
-
-            if(!hasActiveDpad && !hasActiveButtons) {
         for (joystick in overlayJoysticks) {
-                    val stateChanged = joystick.updateStatus(event, pointerIndex, hasActiveJoystick, this)
+            if (!joystick.updateStatus(event, this)) {
-                    if (!stateChanged) {
                 continue
             }
-                    anyOverlayStateChanged = true
-
             val axisID = joystick.joystickId
             NativeLibrary.onGamePadMoveEvent(
                 NativeLibrary.TouchScreenDevice,
@@ -240,52 +146,64 @@ class InputOverlay(context: Context?, attrs: AttributeSet?) : SurfaceView(contex
                 joystick.xAxis,
                 joystick.yAxis
             )
-
             shouldUpdateView = true
         }
-            }
 
         if (shouldUpdateView) {
             invalidate()
         }
 
-            if (preferences.getBoolean("isTouchEnabled", true) &&
+        if (!preferences.getBoolean("isTouchEnabled", true)) {
-                isActionDown &&
+            return true
-                !anyOverlayStateChanged
-            ) {
-                // These need to be recalculated because touching the area
-                // right in the middle of the dpad (between the "buttons") or
-                // tapping a joystick in a certain way both don't cause
-                // `anyOverlayStateChanged` to be set to true
-                var isDpadPressed = false
-                for (dpad in overlayDpads) {
-                    if (dpad.trackId == pointerId) {
-                        isDpadPressed = true
-                        break
-                    }
-                }
-                var isJoystickPressed = false
-                for (joystick in overlayJoysticks) {
-                    if (joystick.trackId == pointerId) {
-                        isJoystickPressed = true
-                        break
-                    }
         }
 
-                if (!isDpadPressed && !isJoystickPressed) {
+        val pointerIndex = event.actionIndex
+        val xPosition = event.getX(pointerIndex).toInt()
+        val yPosition = event.getY(pointerIndex).toInt()
+        val pointerId = event.getPointerId(pointerIndex)
+        val motionEvent = event.action and MotionEvent.ACTION_MASK
+        val isActionDown =
+            motionEvent == MotionEvent.ACTION_DOWN || motionEvent == MotionEvent.ACTION_POINTER_DOWN
+        val isActionMove = motionEvent == MotionEvent.ACTION_MOVE
+        val isActionUp =
+            motionEvent == MotionEvent.ACTION_UP || motionEvent == MotionEvent.ACTION_POINTER_UP
+        if (isActionDown && !isTouchInputConsumed(pointerId)) {
             NativeLibrary.onTouchEvent(xPosition.toFloat(), yPosition.toFloat(), true)
         }
+        if (isActionMove) {
+            for (i in 0 until event.pointerCount) {
+                val fingerId = event.getPointerId(i)
+                if (isTouchInputConsumed(fingerId)) {
+                    continue
                 }
-
+                NativeLibrary.onTouchMoved(xPosition.toFloat(), yPosition.toFloat())
-            // We should only loop here if touch is being dragged
-            if (!isActionMove) {
-                break
             }
-
+        }
+        if (isActionUp && !isTouchInputConsumed(pointerId)) {
+            NativeLibrary.onTouchEvent(0f, 0f, false)
         }
         return true
     }
 
+    private fun isTouchInputConsumed(trackId: Int): Boolean {
+        overlayButtons.forEach {
+            if (it.trackId == trackId) {
+                return true
+            }
+        }
+        overlayDpads.forEach {
+            if (it.trackId == trackId) {
+                return true
+            }
+        }
+        overlayJoysticks.forEach {
+            if (it.trackId == trackId) {
+                return true
+            }
+        }
+        return false
+    }
+
     fun onTouchWhileEditing(event: MotionEvent): Boolean {
         val pointerIndex = event.actionIndex
         val fingerPositionX = event.getX(pointerIndex).toInt()

src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableButton.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -12,20 +12,6 @@ import android.graphics.drawable.BitmapDrawable
 import android.view.HapticFeedbackConstants
 import android.view.MotionEvent
 import org.citra.citra_emu.NativeLibrary
-import org.citra.citra_emu.utils.EmulationMenuSettings
-
-enum class ButtonSlidingMode(val int: Int) {
-    // Disabled, buttons can only be triggered by pressing them directly.
-    Disabled(0),
-
-    // Additionally to pressing buttons directly, they can be activated and released by sliding into
-    // and out of their area.
-    Enabled(1),
-
-    // The first button is kept activated until released, further buttons use the simple button
-    // sliding method.
-    Alternative(2)
-}
 
 /**
  * Custom [BitmapDrawable] that is capable
@@ -44,9 +30,6 @@ class InputOverlayDrawableButton(
     val opacity: Int
 ) {
     var trackId: Int
-
-    private var isMotionFirstButton = false // mark the first activated button with the current motion
-
     private var previousTouchX = 0
     private var previousTouchY = 0
     private var controlPositionX = 0
@@ -70,8 +53,8 @@ class InputOverlayDrawableButton(
      *
      * @return true if value was changed
      */
-    fun updateStatus(event: MotionEvent, pointerIndex: Int, hasActiveButtons: Boolean, overlay: InputOverlay): Boolean {
+    fun updateStatus(event: MotionEvent, overlay:InputOverlay): Boolean {
-        val buttonSliding = EmulationMenuSettings.buttonSlide
+        val pointerIndex = event.actionIndex
         val xPosition = event.getX(pointerIndex).toInt()
         val yPosition = event.getY(pointerIndex).toInt()
         val pointerId = event.getPointerId(pointerIndex)
@@ -84,63 +67,21 @@ class InputOverlayDrawableButton(
             if (!bounds.contains(xPosition, yPosition)) {
                 return false
             }
-            buttonDown(true, pointerId, overlay)
+            pressedState = true
+            trackId = pointerId
+            overlay.hapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
             return true
         }
         if (isActionUp) {
             if (trackId != pointerId) {
                 return false
             }
-            buttonUp(overlay, false)
-            return true
-        }
-
-        val isActionMoving = motionEvent == MotionEvent.ACTION_MOVE
-        if (buttonSliding != ButtonSlidingMode.Disabled.int && isActionMoving) {
-            val inside = bounds.contains(xPosition, yPosition)
-            if (pressedState) {
-                // button is already pressed
-                // check whether we moved out of the button area to update the state
-                if (inside || trackId != pointerId) {
-                    return false
-                }
-
-                // prevent the first (directly pressed) button to deactivate when sliding off
-                if (buttonSliding == ButtonSlidingMode.Alternative.int && isMotionFirstButton) {
-                    return false
-                }
-
-                val preserveTrackId = (buttonSliding != ButtonSlidingMode.Disabled.int)
-                buttonUp(overlay, preserveTrackId)
-                return true
-            } else {
-                // button was not yet pressed
-                // check whether we moved into the button area to update the state
-                if (!inside) {
-                    return false
-                }
-                buttonDown(!hasActiveButtons, pointerId, overlay)
-                return true
-            }
-        }
-
-        return false
-    }
-
-    private fun buttonDown(firstBtn: Boolean, pointerId: Int, overlay: InputOverlay) {
-        pressedState = true
-        isMotionFirstButton = firstBtn
-        trackId = pointerId
-        overlay.hapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
-    }
-
-    private fun buttonUp(overlay: InputOverlay, preserveTrackId: Boolean) {
             pressedState = false
-        isMotionFirstButton = false
-        if (!preserveTrackId) {
             trackId = -1
-        }
             overlay.hapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY_RELEASE)
+            return true
+        }
+        return false
     }
 
     fun onConfigureTouch(event: MotionEvent): Boolean {

src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableDpad.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -12,7 +12,6 @@ import android.graphics.drawable.BitmapDrawable
 import android.view.HapticFeedbackConstants
 import android.view.MotionEvent
 import org.citra.citra_emu.NativeLibrary
-import org.citra.citra_emu.utils.EmulationMenuSettings
 
 /**
  * Custom [BitmapDrawable] that is capable
@@ -63,18 +62,15 @@ class InputOverlayDrawableDpad(
         trackId = -1
     }
 
-    fun updateStatus(event: MotionEvent, pointerIndex: Int, hasActiveButtons: Boolean, dpadSlide: Boolean, overlay: InputOverlay): Boolean {
+    fun updateStatus(event: MotionEvent, dpadSlide: Boolean, overlay:InputOverlay): Boolean {
         var isDown = false
+        val pointerIndex = event.actionIndex
         val xPosition = event.getX(pointerIndex).toInt()
         val yPosition = event.getY(pointerIndex).toInt()
         val pointerId = event.getPointerId(pointerIndex)
         val motionEvent = event.action and MotionEvent.ACTION_MASK
-        var isActionDown =
+        val isActionDown =
             motionEvent == MotionEvent.ACTION_DOWN || motionEvent == MotionEvent.ACTION_POINTER_DOWN
-        if (!isActionDown && EmulationMenuSettings.buttonSlide != ButtonSlidingMode.Disabled.int) {
-            isActionDown = motionEvent == MotionEvent.ACTION_MOVE && !hasActiveButtons
-        }
-
         val isActionUp =
             motionEvent == MotionEvent.ACTION_UP || motionEvent == MotionEvent.ACTION_POINTER_UP
         if (isActionDown) {

src/android/app/src/main/java/org/citra/citra_emu/overlay/InputOverlayDrawableJoystick.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -93,17 +93,14 @@ class InputOverlayDrawableJoystick(
         currentStateBitmapDrawable.draw(canvas)
     }
 
-    fun updateStatus(event: MotionEvent, pointerIndex: Int, hasActiveButtons: Boolean, overlay: InputOverlay): Boolean {
+    fun updateStatus(event: MotionEvent, overlay:InputOverlay): Boolean {
+        val pointerIndex = event.actionIndex
         val xPosition = event.getX(pointerIndex).toInt()
         val yPosition = event.getY(pointerIndex).toInt()
         val pointerId = event.getPointerId(pointerIndex)
         val motionEvent = event.action and MotionEvent.ACTION_MASK
-        var isActionDown =
+        val isActionDown =
             motionEvent == MotionEvent.ACTION_DOWN || motionEvent == MotionEvent.ACTION_POINTER_DOWN
-        if (!isActionDown && EmulationMenuSettings.buttonSlide != ButtonSlidingMode.Disabled.int) {
-            isActionDown = motionEvent == MotionEvent.ACTION_MOVE && !hasActiveButtons
-        }
-
         val isActionUp =
             motionEvent == MotionEvent.ACTION_UP || motionEvent == MotionEvent.ACTION_POINTER_UP
         if (isActionDown) {

src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt

@@ -332,7 +332,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
         }
 
         val selectedFiles =
-            FileBrowserHelper.getSelectedFiles(result, applicationContext, listOf("cia", "zcia"))
+            FileBrowserHelper.getSelectedFiles(result, applicationContext, listOf("cia"))
         if (selectedFiles == null) {
             Toast.makeText(applicationContext, R.string.cia_file_not_found, Toast.LENGTH_LONG)
                 .show()

src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationLifecycleUtil.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -18,27 +18,15 @@ object EmulationLifecycleUtil {
     }
 
     fun addShutdownHook(hook: Runnable) {
-        if (shutdownHooks.contains(hook)) {
-            Log.warning("[EmulationLifecycleUtil] Tried to add shutdown hook for function that already existed. Skipping.")
-        } else {
         shutdownHooks.add(hook)
     }
-    }
 
     fun addPauseResumeHook(hook: Runnable) {
-        if (pauseResumeHooks.contains(hook)) {
-            Log.warning("[EmulationLifecycleUtil] Tried to add pause resume hook for function that already existed. Skipping.")
-        } else {
         pauseResumeHooks.add(hook)
     }
-    }
 
-    fun removeHook(hook: Runnable) {
+    fun clear() {
-        if (pauseResumeHooks.contains(hook)) {
+        pauseResumeHooks.clear()
-            pauseResumeHooks.remove(hook)
+        shutdownHooks.clear()
-        }
-        if (shutdownHooks.contains(hook)) {
-            shutdownHooks.remove(hook)
-        }
     }
 }

src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationMenuSettings.kt

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -7,7 +7,6 @@ package org.citra.citra_emu.utils
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.preference.PreferenceManager
 import org.citra.citra_emu.CitraApplication
-import org.citra.citra_emu.overlay.ButtonSlidingMode
 
 object EmulationMenuSettings {
     private val preferences =
@@ -27,14 +26,14 @@ object EmulationMenuSettings {
                 .putBoolean("EmulationMenuSettings_DpadSlideEnable", value)
                 .apply()
         }
-    var buttonSlide: Int
+
-        get() = preferences.getInt("EmulationMenuSettings_ButtonSlideMode", ButtonSlidingMode.Disabled.int)
+    var showPerformanceOverlay: Boolean
+        get() = preferences.getBoolean("EmulationMenuSettings_showPerformanceOverlay", false)
         set(value) {
             preferences.edit()
-                .putInt("EmulationMenuSettings_ButtonSlideMode", value)
+                    .putBoolean("EmulationMenuSettings_showPerformanceOverlay", value)
                     .apply()
         }
-
     var hapticFeedback: Boolean
         get() = preferences.getBoolean("EmulationMenuSettings_HapticFeedback", true)
         set(value) {

src/android/app/src/main/java/org/citra/citra_emu/utils/GameHelper.kt

@@ -70,26 +70,29 @@ object GameHelper {
 
     fun getGame(uri: Uri, isInstalled: Boolean, addedToLibrary: Boolean): Game {
         val filePath = uri.toString()
-        var gameInfo: GameInfo? = GameInfo(filePath)
+        var gameInfo: GameInfo? = try {
-
+            GameInfo(filePath)
-        if (gameInfo?.isValid() == false) {
+        } catch (e: IOException) {
-            gameInfo = null
+            null
         }
 
-        val isEncrypted = gameInfo?.isEncrypted() == true
+        var isEncrypted = false
+        if (gameInfo?.isEncrypted() == true) {
+            gameInfo = null
+            isEncrypted = true
+        }
 
         val newGame = Game(
             (gameInfo?.getTitle() ?: FileUtil.getFilename(uri)).replace("[\\t\\n\\r]+".toRegex(), " "),
             filePath.replace("\n", " "),
             filePath,
-            gameInfo?.getTitleID() ?: 0,
+            NativeLibrary.getTitleId(filePath),
             gameInfo?.getCompany() ?: "",
-            if (isEncrypted) { CitraApplication.appContext.getString(R.string.unsupported_encrypted) } else { gameInfo?.getRegions() ?: "" },
+            gameInfo?.getRegions() ?: (if (isEncrypted) { CitraApplication.appContext.getString(R.string.unsupported_encrypted) } else { CitraApplication.appContext.getString(R.string.invalid_region) }),
             isInstalled,
-            gameInfo?.isSystemTitle() ?: false,
+            NativeLibrary.getIsSystemTitle(filePath),
             gameInfo?.getIsVisibleSystemTitle() ?: false,
             gameInfo?.getIcon(),
-            gameInfo?.getFileType() ?: "",
             if (FileUtil.isNativePath(filePath)) {
                 CitraApplication.documentsTree.getFilename(filePath)
             } else {

src/android/app/src/main/jni/config.cpp

@@ -160,11 +160,11 @@ void Config::ReadValues() {
 
     ReadSetting("Renderer", Settings::values.render_3d);
     ReadSetting("Renderer", Settings::values.factor_3d);
-    std::string default_shader = "None (builtin)";
+    std::string default_shader = "none (builtin)";
     if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::Anaglyph)
-        default_shader = "Dubois (builtin)";
+        default_shader = "dubois (builtin)";
     else if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::Interlaced)
-        default_shader = "Horizontal (builtin)";
+        default_shader = "horizontal (builtin)";
     Settings::values.pp_shader_name =
         sdl2_config->GetString("Renderer", "pp_shader_name", default_shader);
     ReadSetting("Renderer", Settings::values.filter_mode);
@@ -172,7 +172,6 @@ void Config::ReadValues() {
     ReadSetting("Renderer", Settings::values.bg_red);
     ReadSetting("Renderer", Settings::values.bg_green);
     ReadSetting("Renderer", Settings::values.bg_blue);
-    ReadSetting("Renderer", Settings::values.custom_second_layer_opacity);
     ReadSetting("Renderer", Settings::values.delay_game_render_thread_us);
     ReadSetting("Renderer", Settings::values.disable_right_eye_render);
 
@@ -210,9 +209,6 @@ void Config::ReadValues() {
         static_cast<Settings::PortraitLayoutOption>(sdl2_config->GetInteger(
             "Layout", "portrait_layout_option",
             static_cast<int>(Settings::PortraitLayoutOption::PortraitTopFullWidth)));
-    Settings::values.secondary_display_layout = static_cast<Settings::SecondaryDisplayLayout>(
-        sdl2_config->GetInteger("Layout", "secondary_display_layout",
-                                static_cast<int>(Settings::SecondaryDisplayLayout::None)));
     ReadSetting("Layout", Settings::values.custom_portrait_top_x);
     ReadSetting("Layout", Settings::values.custom_portrait_top_y);
     ReadSetting("Layout", Settings::values.custom_portrait_top_width);
@@ -222,9 +218,6 @@ void Config::ReadValues() {
     ReadSetting("Layout", Settings::values.custom_portrait_bottom_width);
     ReadSetting("Layout", Settings::values.custom_portrait_bottom_height);
 
-    // Storage
-    ReadSetting("Storage", Settings::values.compress_cia_installs);
-
     // Utility
     ReadSetting("Utility", Settings::values.dump_textures);
     ReadSetting("Utility", Settings::values.custom_textures);

src/android/app/src/main/jni/default_ini.h

@@ -170,9 +170,6 @@ bg_red =
 bg_blue =
 bg_green =
 
-# Opacity of second layer when using custom layout option (bottom screen unless swapped). Useful if positioning on top of the first layer.
-custom_second_layer_opacity =
-
 # Whether and how Stereoscopic 3D should be rendered
 # 0 (default): Off, 1: Side by Side, 2: Reverse Side by Side, 3: Anaglyph, 4: Interlaced, 5: Reverse Interlaced, 6: Cardboard VR
 render_3d =
@@ -213,11 +210,6 @@ disable_right_eye_render =
 # 5: Custom Layout
 layout_option =
 
-[Storage]
-# Whether to compress the installed CIA contents
-# 0 (default): Do not compress, 1: Compress
-compress_cia_installs =
-
 # Position of the performance overlay
 # 0: Top Left
 # 1: Center Top
@@ -291,15 +283,6 @@ swap_screen =
 # 0 (default): Off, 1: On
 expand_to_cutout_area =
 
-# Secondary Display Layout
-# What the game should do if a secondary display is connected physically or using
-# Miracast / Chromecast screen mirroring
-# 0 (default) - Use System Default (mirror)
-# 1 - Show Top Screen Only
-# 2 - Show Bottom Screen Only
-# 3 - Show both screens side by side
-secondary_display_layout =
-
 # Screen placement settings when using Cardboard VR (render3d = 4)
 # 30 - 100: Screen size as a percentage of the viewport. 85 (default)
 cardboard_screen_size =
@@ -483,8 +466,9 @@ deterministic_async_operations =
 
 [WebService]
 # URL for Web API
-web_api_url =
+web_api_url = https://api.citra-emu.org
 # Username and token for Citra Web Service
+# See https://profile.citra-emu.org/ for more info
 citra_username =
 citra_token =
 )";

src/android/app/src/main/jni/emu_window/emu_window.cpp

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2019 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -49,16 +49,16 @@ void EmuWindow_Android::OnFramebufferSizeChanged() {
 
     const int bigger{window_width > window_height ? window_width : window_height};
     const int smaller{window_width < window_height ? window_width : window_height};
-    if (is_portrait_mode && !is_secondary) {
+    if (is_portrait_mode) {
         UpdateCurrentFramebufferLayout(smaller, bigger, is_portrait_mode);
     } else {
         UpdateCurrentFramebufferLayout(bigger, smaller, is_portrait_mode);
     }
 }
 
-EmuWindow_Android::EmuWindow_Android(ANativeWindow* surface, bool is_secondary)
+EmuWindow_Android::EmuWindow_Android(ANativeWindow* surface) : host_window{surface} {
-    : EmuWindow{is_secondary}, host_window(surface) {
     LOG_DEBUG(Frontend, "Initializing EmuWindow_Android");
+
     if (!surface) {
         LOG_CRITICAL(Frontend, "surface is nullptr");
         return;

src/android/app/src/main/jni/emu_window/emu_window.h

@@ -1,11 +1,10 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2019 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #pragma once
 
 #include <vector>
-#include <EGL/egl.h>
 #include "core/frontend/emu_window.h"
 
 namespace Core {
@@ -14,7 +13,7 @@ class System;
 
 class EmuWindow_Android : public Frontend::EmuWindow {
 public:
-    EmuWindow_Android(ANativeWindow* surface, bool is_secondary = false);
+    EmuWindow_Android(ANativeWindow* surface);
     ~EmuWindow_Android();
 
     /// Called by the onSurfaceChanges() method to change the surface
@@ -31,12 +30,7 @@ public:
     void DoneCurrent() override;
 
     virtual void TryPresenting() {}
-    // EGL Context must be shared
+
-    // could probably use the existing
-    // SharedContext for this instead, this is maybe temporary
-    virtual EGLContext* GetEGLContext() {
-        return nullptr;
-    }
     virtual void StopPresenting() {}
 
 protected:

src/android/app/src/main/jni/emu_window/emu_window_gl.cpp

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2019 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -72,9 +72,8 @@ private:
     EGLContext egl_context{};
 };
 
-EmuWindow_Android_OpenGL::EmuWindow_Android_OpenGL(Core::System& system_, ANativeWindow* surface,
+EmuWindow_Android_OpenGL::EmuWindow_Android_OpenGL(Core::System& system_, ANativeWindow* surface)
-                                                   bool is_secondary, EGLContext* sharedContext)
+    : EmuWindow_Android{surface}, system{system_} {
-    : EmuWindow_Android{surface, is_secondary}, system{system_} {
     if (egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY); egl_display == EGL_NO_DISPLAY) {
         LOG_CRITICAL(Frontend, "eglGetDisplay() failed");
         return;
@@ -97,10 +96,8 @@ EmuWindow_Android_OpenGL::EmuWindow_Android_OpenGL(Core::System& system_, ANativ
     if (eglQuerySurface(egl_display, egl_surface, EGL_HEIGHT, &window_height) != EGL_TRUE) {
         return;
     }
-    if (sharedContext) {
+
-        egl_context = *sharedContext;
+    if (egl_context = eglCreateContext(egl_display, egl_config, 0, egl_context_attribs.data());
-    } else if (egl_context =
-                   eglCreateContext(egl_display, egl_config, 0, egl_context_attribs.data());
         egl_context == EGL_NO_CONTEXT) {
         LOG_CRITICAL(Frontend, "eglCreateContext() failed");
         return;
@@ -130,10 +127,6 @@ EmuWindow_Android_OpenGL::EmuWindow_Android_OpenGL(Core::System& system_, ANativ
     OnFramebufferSizeChanged();
 }
 
-EGLContext* EmuWindow_Android_OpenGL::GetEGLContext() {
-    return &egl_context;
-}
-
 bool EmuWindow_Android_OpenGL::CreateWindowSurface() {
     if (!host_window) {
         return true;
@@ -211,14 +204,14 @@ void EmuWindow_Android_OpenGL::TryPresenting() {
         return;
     }
     if (presenting_state == PresentingState::Initial) [[unlikely]] {
+        eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
+        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
         presenting_state = PresentingState::Running;
     }
     if (presenting_state != PresentingState::Running) [[unlikely]] {
         return;
     }
-    eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
-    glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
     eglSwapInterval(egl_display, Settings::values.use_vsync_new ? 1 : 0);
-    system.GPU().Renderer().TryPresent(0, is_secondary);
+    system.GPU().Renderer().TryPresent(0);
     eglSwapBuffers(egl_display, egl_surface);
 }

src/android/app/src/main/jni/emu_window/emu_window_gl.h

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2019 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -19,14 +19,13 @@ struct ANativeWindow;
 
 class EmuWindow_Android_OpenGL : public EmuWindow_Android {
 public:
-    EmuWindow_Android_OpenGL(Core::System& system, ANativeWindow* surface, bool is_secondary,
+    EmuWindow_Android_OpenGL(Core::System& system, ANativeWindow* surface);
-                             EGLContext* sharedContext = NULL);
     ~EmuWindow_Android_OpenGL() override = default;
 
     void TryPresenting() override;
     void StopPresenting() override;
     void PollEvents() override;
-    EGLContext* GetEGLContext() override;
+
     std::unique_ptr<GraphicsContext> CreateSharedContext() const override;
 
 private:

src/android/app/src/main/jni/emu_window/emu_window_vk.cpp

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2019 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -24,9 +24,8 @@ private:
 };
 
 EmuWindow_Android_Vulkan::EmuWindow_Android_Vulkan(
-    ANativeWindow* surface, std::shared_ptr<Common::DynamicLibrary> driver_library_,
+    ANativeWindow* surface, std::shared_ptr<Common::DynamicLibrary> driver_library_)
-    bool is_secondary)
+    : EmuWindow_Android{surface}, driver_library{driver_library_} {
-    : EmuWindow_Android{surface, is_secondary}, driver_library{driver_library_} {
     CreateWindowSurface();
 
     if (core_context = CreateSharedContext(); !core_context) {

src/android/app/src/main/jni/emu_window/emu_window_vk.h

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2022 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -11,8 +11,7 @@ struct ANativeWindow;
 class EmuWindow_Android_Vulkan : public EmuWindow_Android {
 public:
     EmuWindow_Android_Vulkan(ANativeWindow* surface,
-                             std::shared_ptr<Common::DynamicLibrary> driver_library,
+                             std::shared_ptr<Common::DynamicLibrary> driver_library);
-                             bool is_secondary);
     ~EmuWindow_Android_Vulkan() override = default;
 
     void PollEvents() override {}

src/android/app/src/main/jni/game_info.cpp

@@ -17,50 +17,28 @@
 
 namespace {
 
-static constexpr u64 UPDATE_TID_HIGH = 0x0004000e00000000;
+std::vector<u8> GetSMDHData(const std::string& path, bool& is_encrypted) {
-
-struct GameInfoData {
-    Loader::SMDH smdh;
-    u64 title_id = 0;
-    bool loaded = false;
-    bool is_encrypted = false;
-    std::string file_type = "";
-};
-
-GameInfoData* GetNewGameInfoData(const std::string& path) {
     std::unique_ptr<Loader::AppLoader> loader = Loader::GetLoader(path);
-    u64 program_id = 0;
+    if (!loader) {
-    bool is_encrypted = false;
+        return {};
-    Loader::ResultStatus result{};
-    if (loader) {
-        result = loader->ReadProgramId(program_id);
-        if (result == Loader::ResultStatus::ErrorNotImplemented) {
-            // This can happen for 3DSX and ELF files.
-            program_id = 0;
-            result = Loader::ResultStatus::Success;
-        }
     }
 
-    if (!loader || result != Loader::ResultStatus::Success) {
+    u64 program_id = 0;
-        GameInfoData* gid = new GameInfoData();
+    loader->ReadProgramId(program_id);
-        memset(&gid->smdh, 0, sizeof(Loader::SMDH));
-        return gid;
-    }
 
     std::vector<u8> smdh = [program_id, &loader, &is_encrypted]() -> std::vector<u8> {
         std::vector<u8> original_smdh;
         auto result = loader->ReadIcon(original_smdh);
-        if (result != Loader::ResultStatus::Success) {
+        if (result == Loader::ResultStatus::ErrorEncrypted) {
-            is_encrypted = result == Loader::ResultStatus::ErrorEncrypted;
+            is_encrypted = true;
-            return {};
+            return original_smdh;
         }
 
         if (program_id < 0x00040000'00000000 || program_id > 0x00040000'FFFFFFFF)
             return original_smdh;
 
-        u64 update_tid = (program_id & 0xFFFFFFFFULL) | UPDATE_TID_HIGH;
+        std::string update_path = Service::AM::GetTitleContentPath(
-        std::string update_path =
+            Service::FS::MediaType::SDMC, program_id + 0x0000000E'00000000);
-            Service::AM::GetTitleContentPath(Service::FS::MediaType::SDMC, update_tid);
 
         if (!FileUtil::Exists(update_path))
             return original_smdh;
@@ -71,50 +49,41 @@ GameInfoData* GetNewGameInfoData(const std::string& path) {
             return original_smdh;
 
         std::vector<u8> update_smdh;
-        result = update_loader->ReadIcon(update_smdh);
+        update_loader->ReadIcon(update_smdh);
-        if (result != Loader::ResultStatus::Success) {
-            is_encrypted = result == Loader::ResultStatus::ErrorEncrypted;
-            return {};
-        }
         return update_smdh;
     }();
 
-    GameInfoData* gid = new GameInfoData();
+    return smdh;
-    if (smdh.empty()) {
-        std::memset(&gid->smdh, 0, sizeof(Loader::SMDH));
-    } else {
-        std::memcpy(&gid->smdh, smdh.data(), smdh.size());
-    }
-    gid->loaded = true;
-    gid->is_encrypted = is_encrypted;
-    gid->title_id = program_id;
-    gid->file_type = Loader::GetFileTypeString(loader->GetFileType(), loader->IsFileCompressed());
-
-    return gid;
 }
 
 } // namespace
 
 extern "C" {
 
-static GameInfoData* GetPointer(JNIEnv* env, jobject obj) {
+static Loader::SMDH* GetPointer(JNIEnv* env, jobject obj) {
-    return reinterpret_cast<GameInfoData*>(env->GetLongField(obj, IDCache::GetGameInfoPointer()));
+    return reinterpret_cast<Loader::SMDH*>(env->GetLongField(obj, IDCache::GetGameInfoPointer()));
 }
 
 JNIEXPORT jlong JNICALL Java_org_citra_citra_1emu_model_GameInfo_initialize(JNIEnv* env, jclass,
                                                                             jstring j_path) {
-    GameInfoData* game_info_data = GetNewGameInfoData(GetJString(env, j_path));
+    bool is_encrypted = false;
-    return reinterpret_cast<jlong>(game_info_data);
+    std::vector<u8> smdh_data = GetSMDHData(GetJString(env, j_path), is_encrypted);
-}
 
-JNIEXPORT jboolean JNICALL Java_org_citra_citra_1emu_model_GameInfo_isValid(JNIEnv* env,
+    Loader::SMDH* smdh = nullptr;
-                                                                            jobject obj) {
+    if (is_encrypted) {
-    return GetPointer(env, obj)->loaded;
+        smdh = new Loader::SMDH;
+        smdh->magic = 0xDEADDEAD;
+    } else if (Loader::IsValidSMDH(smdh_data)) {
+        smdh = new Loader::SMDH;
+        std::memcpy(smdh, smdh_data.data(), sizeof(Loader::SMDH));
+    }
+    return reinterpret_cast<jlong>(smdh);
 }
 
 JNIEXPORT jboolean JNICALL Java_org_citra_citra_1emu_model_GameInfo_isEncrypted(JNIEnv* env,
                                                                                 jobject obj) {
-    return GetPointer(env, obj)->is_encrypted;
+    Loader::SMDH* smdh = GetPointer(env, obj);
+    return smdh->magic == 0xDEADDEAD;
 }
 
 JNIEXPORT void JNICALL Java_org_citra_citra_1emu_model_GameInfo_finalize(JNIEnv* env, jobject obj) {
@@ -122,11 +91,7 @@ JNIEXPORT void JNICALL Java_org_citra_citra_1emu_model_GameInfo_finalize(JNIEnv*
 }
 
 jstring Java_org_citra_citra_1emu_model_GameInfo_getTitle(JNIEnv* env, jobject obj) {
-    Loader::SMDH* smdh = &GetPointer(env, obj)->smdh;
+    Loader::SMDH* smdh = GetPointer(env, obj);
-    if (!smdh->IsValid()) {
-        return ToJString(env, "");
-    }
-
     Loader::SMDH::TitleLanguage language = Loader::SMDH::TitleLanguage::English;
 
     // Get the title from SMDH in UTF-16 format
@@ -137,11 +102,7 @@ jstring Java_org_citra_citra_1emu_model_GameInfo_getTitle(JNIEnv* env, jobject o
 }
 
 jstring Java_org_citra_citra_1emu_model_GameInfo_getCompany(JNIEnv* env, jobject obj) {
-    Loader::SMDH* smdh = &GetPointer(env, obj)->smdh;
+    Loader::SMDH* smdh = GetPointer(env, obj);
-    if (!smdh->IsValid()) {
-        return ToJString(env, "");
-    }
-
     Loader::SMDH::TitleLanguage language = Loader::SMDH::TitleLanguage::English;
 
     // Get the Publisher's name from SMDH in UTF-16 format
@@ -152,15 +113,8 @@ jstring Java_org_citra_citra_1emu_model_GameInfo_getCompany(JNIEnv* env, jobject
     return ToJString(env, Common::UTF16ToUTF8(publisher).data());
 }
 
-jlong Java_org_citra_citra_1emu_model_GameInfo_getTitleID(JNIEnv* env, jobject obj) {
-    return static_cast<jlong>(GetPointer(env, obj)->title_id);
-}
-
 jstring Java_org_citra_citra_1emu_model_GameInfo_getRegions(JNIEnv* env, jobject obj) {
-    Loader::SMDH* smdh = &GetPointer(env, obj)->smdh;
+    Loader::SMDH* smdh = GetPointer(env, obj);
-    if (!smdh->IsValid()) {
-        return ToJString(env, "");
-    }
 
     using GameRegion = Loader::SMDH::GameRegion;
     static const std::map<GameRegion, const char*> regions_map = {
@@ -193,10 +147,7 @@ jstring Java_org_citra_citra_1emu_model_GameInfo_getRegions(JNIEnv* env, jobject
 }
 
 jintArray Java_org_citra_citra_1emu_model_GameInfo_getIcon(JNIEnv* env, jobject obj) {
-    Loader::SMDH* smdh = &GetPointer(env, obj)->smdh;
+    Loader::SMDH* smdh = GetPointer(env, obj);
-    if (!smdh->IsValid()) {
-        return nullptr;
-    }
 
     // Always get a 48x48(large) icon
     std::vector<u16> icon_data = smdh->GetIcon(true);
@@ -211,23 +162,12 @@ jintArray Java_org_citra_citra_1emu_model_GameInfo_getIcon(JNIEnv* env, jobject
     return icon;
 }
 
-jboolean Java_org_citra_citra_1emu_model_GameInfo_isSystemTitle(JNIEnv* env, jobject obj) {
-    return ((GetPointer(env, obj)->title_id >> 32) & 0xFFFFFFFF) == 0x00040010;
-}
-
 jboolean Java_org_citra_citra_1emu_model_GameInfo_getIsVisibleSystemTitle(JNIEnv* env,
                                                                           jobject obj) {
-    Loader::SMDH* smdh = &GetPointer(env, obj)->smdh;
+    Loader::SMDH* smdh = GetPointer(env, obj);
-    if (!smdh->IsValid()) {
+    if (smdh == nullptr) {
         return false;
     }
-
     return smdh->flags & Loader::SMDH::Flags::Visible;
 }
-
-jstring Java_org_citra_citra_1emu_model_GameInfo_getFileType(JNIEnv* env, jobject obj) {
-    std::string& file_type = GetPointer(env, obj)->file_type;
-
-    return ToJString(env, file_type);
-}
 }

src/android/app/src/main/jni/native.cpp

@@ -16,20 +16,17 @@
 #include <core/hle/service/cfg/cfg.h>
 #include "audio_core/dsp_interface.h"
 #include "common/arch.h"
-
 #if CITRA_ARCH(arm64)
 #include "common/aarch64/cpu_detect.h"
 #elif CITRA_ARCH(x86_64)
 #include "common/x64/cpu_detect.h"
 #endif
-
 #include "common/common_paths.h"
 #include "common/dynamic_library/dynamic_library.h"
 #include "common/file_util.h"
 #include "common/logging/backend.h"
 #include "common/logging/log.h"
 #include "common/microprofile.h"
-#include "common/play_time_manager.h"
 #include "common/scm_rev.h"
 #include "common/scope_exit.h"
 #include "common/settings.h"
@@ -49,18 +46,12 @@
 #include "jni/camera/ndk_camera.h"
 #include "jni/camera/still_image_camera.h"
 #include "jni/config.h"
-
 #ifdef ENABLE_OPENGL
 #include "jni/emu_window/emu_window_gl.h"
 #endif
-
 #ifdef ENABLE_VULKAN
 #include "jni/emu_window/emu_window_vk.h"
-#if CITRA_ARCH(arm64)
-#include <adrenotools/driver.h>
 #endif
-#endif
-
 #include "jni/id_cache.h"
 #include "jni/input_manager.h"
 #include "jni/ndk_motion.h"
@@ -69,17 +60,16 @@
 #include "video_core/gpu.h"
 #include "video_core/renderer_base.h"
 
+#if defined(ENABLE_VULKAN) && CITRA_ARCH(arm64)
+#include <adrenotools/driver.h>
+#endif
+
 namespace {
 
-ANativeWindow* s_surface;
+ANativeWindow* s_surf;
-ANativeWindow* s_secondary_surface;
 
 std::shared_ptr<Common::DynamicLibrary> vulkan_library{};
 std::unique_ptr<EmuWindow_Android> window;
-std::unique_ptr<EmuWindow_Android> secondary_window;
-
-std::unique_ptr<PlayTime::PlayTimeManager> play_time_manager;
-jlong ptm_current_title_id = std::numeric_limits<jlong>::max(); // Arbitrary default value
 
 std::atomic<bool> stop_run{true};
 std::atomic<bool> pause_emulation{false};
@@ -130,17 +120,8 @@ static void TryShutdown() {
     }
 
     window->DoneCurrent();
-    if (secondary_window) {
-        secondary_window->DoneCurrent();
-    }
-
     Core::System::GetInstance().Shutdown();
-
     window.reset();
-    if (secondary_window) {
-        secondary_window.reset();
-    }
-
     InputManager::Shutdown();
     MicroProfileShutdown();
 }
@@ -166,21 +147,15 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     Core::System& system{Core::System::GetInstance()};
 
     const auto graphics_api = Settings::values.graphics_api.GetValue();
-    EGLContext* shared_context;
     switch (graphics_api) {
 #ifdef ENABLE_OPENGL
     case Settings::GraphicsAPI::OpenGL:
-        window = std::make_unique<EmuWindow_Android_OpenGL>(system, s_surface, false);
+        window = std::make_unique<EmuWindow_Android_OpenGL>(system, s_surf);
-        shared_context = window->GetEGLContext();
-        secondary_window = std::make_unique<EmuWindow_Android_OpenGL>(system, s_secondary_surface,
-                                                                      true, shared_context);
         break;
 #endif
 #ifdef ENABLE_VULKAN
     case Settings::GraphicsAPI::Vulkan:
-        window = std::make_unique<EmuWindow_Android_Vulkan>(s_surface, vulkan_library, false);
+        window = std::make_unique<EmuWindow_Android_Vulkan>(s_surf, vulkan_library);
-        secondary_window =
-            std::make_unique<EmuWindow_Android_Vulkan>(s_secondary_surface, vulkan_library, true);
         break;
 #endif
     default:
@@ -188,17 +163,11 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
                      "Unknown or unsupported graphics API {}, falling back to available default",
                      graphics_api);
 #ifdef ENABLE_OPENGL
-        window = std::make_unique<EmuWindow_Android_OpenGL>(system, s_surface, false);
+        window = std::make_unique<EmuWindow_Android_OpenGL>(system, s_surf);
-        shared_context = window->GetEGLContext();
-        secondary_window = std::make_unique<EmuWindow_Android_OpenGL>(system, s_secondary_surface,
-                                                                      true, shared_context);
-
 #elif ENABLE_VULKAN
-        window = std::make_unique<EmuWindow_Android_Vulkan>(s_surface, vulkan_library);
+        window = std::make_unique<EmuWindow_Android_Vulkan>(s_surf, vulkan_library);
-        secondary_window =
-            std::make_unique<EmuWindow_Android_Vulkan>(s_secondary_surface, vulkan_library, true);
 #else
-        // TODO: Add a null renderer backend for this, perhaps.
+// TODO: Add a null renderer backend for this, perhaps.
 #error "At least one renderer must be enabled."
 #endif
         break;
@@ -235,8 +204,7 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     InputManager::Init();
 
     window->MakeCurrent();
-    const Core::System::ResultStatus load_result{
+    const Core::System::ResultStatus load_result{system.Load(*window, filepath)};
-        system.Load(*window, filepath, secondary_window.get())};
     if (load_result != Core::System::ResultStatus::Success) {
         return load_result;
     }
@@ -332,68 +300,28 @@ extern "C" {
 void Java_org_citra_citra_1emu_NativeLibrary_surfaceChanged(JNIEnv* env,
                                                             [[maybe_unused]] jobject obj,
                                                             jobject surf) {
-    s_surface = ANativeWindow_fromSurface(env, surf);
+    s_surf = ANativeWindow_fromSurface(env, surf);
 
     bool notify = false;
     if (window) {
-        notify = window->OnSurfaceChanged(s_surface);
+        notify = window->OnSurfaceChanged(s_surf);
     }
 
     auto& system = Core::System::GetInstance();
     if (notify && system.IsPoweredOn()) {
-        system.GPU().Renderer().NotifySurfaceChanged(false);
+        system.GPU().Renderer().NotifySurfaceChanged();
     }
 
     LOG_INFO(Frontend, "Surface changed");
 }
 
-void Java_org_citra_citra_1emu_NativeLibrary_secondarySurfaceChanged(JNIEnv* env,
-                                                                     [[maybe_unused]] jobject obj,
-                                                                     jobject surf) {
-    auto& system = Core::System::GetInstance();
-
-    if (s_secondary_surface) {
-        ANativeWindow_release(s_secondary_surface);
-        s_secondary_surface = nullptr;
-    }
-    s_secondary_surface = ANativeWindow_fromSurface(env, surf);
-    if (!s_secondary_surface) {
-        return;
-    }
-
-    bool notify = false;
-    if (secondary_window) {
-        // Second window already created, so update it
-        notify = secondary_window->OnSurfaceChanged(s_secondary_surface);
-    } else {
-        LOG_WARNING(Frontend,
-                    "Second Window does not exist in native.cpp but surface changed. Ignoring.");
-    }
-
-    if (notify && system.IsPoweredOn()) {
-        system.GPU().Renderer().NotifySurfaceChanged(true);
-    }
-
-    LOG_INFO(Frontend, "Secondary Surface changed");
-}
-
-void Java_org_citra_citra_1emu_NativeLibrary_secondarySurfaceDestroyed(
-    JNIEnv* env, [[maybe_unused]] jobject obj) {
-    if (s_secondary_surface != nullptr) {
-        ANativeWindow_release(s_secondary_surface);
-        s_secondary_surface = nullptr;
-    }
-
-    LOG_INFO(Frontend, "Secondary Surface Destroyed");
-}
-
 void Java_org_citra_citra_1emu_NativeLibrary_surfaceDestroyed([[maybe_unused]] JNIEnv* env,
                                                               [[maybe_unused]] jobject obj) {
-    if (s_surface != nullptr) {
+    if (s_surf != nullptr) {
-        ANativeWindow_release(s_surface);
+        ANativeWindow_release(s_surf);
-        s_surface = nullptr;
+        s_surf = nullptr;
         if (window) {
-            window->OnSurfaceChanged(s_surface);
+            window->OnSurfaceChanged(s_surf);
         }
     }
 }
@@ -406,9 +334,6 @@ void Java_org_citra_citra_1emu_NativeLibrary_doFrame([[maybe_unused]] JNIEnv* en
     if (window) {
         window->TryPresenting();
     }
-    if (secondary_window) {
-        secondary_window->TryPresenting();
-    }
 }
 
 void JNICALL Java_org_citra_citra_1emu_NativeLibrary_initializeGpuDriver(
@@ -585,9 +510,6 @@ void Java_org_citra_citra_1emu_NativeLibrary_stopEmulation([[maybe_unused]] JNIE
     stop_run = true;
     pause_emulation = false;
     window->StopPresenting();
-    if (secondary_window) {
-        secondary_window->StopPresenting();
-    }
     running_cv.notify_all();
 }
 
@@ -657,25 +579,6 @@ void Java_org_citra_citra_1emu_NativeLibrary_onTouchMoved([[maybe_unused]] JNIEn
     window->OnTouchMoved((int)x, (int)y);
 }
 
-jboolean Java_org_citra_citra_1emu_NativeLibrary_onSecondaryTouchEvent([[maybe_unused]] JNIEnv* env,
-                                                                       [[maybe_unused]] jobject obj,
-                                                                       jfloat x, jfloat y,
-                                                                       jboolean pressed) {
-    if (!secondary_window) {
-        return JNI_FALSE;
-    }
-    return static_cast<jboolean>(secondary_window->OnTouchEvent(
-        static_cast<int>(x + 0.5), static_cast<int>(y + 0.5), pressed));
-}
-
-void Java_org_citra_citra_1emu_NativeLibrary_onSecondaryTouchMoved([[maybe_unused]] JNIEnv* env,
-                                                                   [[maybe_unused]] jobject obj,
-                                                                   jfloat x, jfloat y) {
-    if (secondary_window) {
-        secondary_window->OnTouchMoved((int)x, (int)y);
-    }
-}
-
 jlong Java_org_citra_citra_1emu_NativeLibrary_getTitleId(JNIEnv* env, [[maybe_unused]] jobject obj,
                                                          jstring j_filename) {
     std::string filepath = GetJString(env, j_filename);
@@ -741,19 +644,18 @@ void Java_org_citra_citra_1emu_NativeLibrary_reloadSettings([[maybe_unused]] JNI
 jdoubleArray Java_org_citra_citra_1emu_NativeLibrary_getPerfStats(JNIEnv* env,
                                                                   [[maybe_unused]] jobject obj) {
     auto& core = Core::System::GetInstance();
-    jdoubleArray j_stats = env->NewDoubleArray(9);
+    jdoubleArray j_stats = env->NewDoubleArray(8);
 
     if (core.IsPoweredOn()) {
         auto results = core.GetAndResetPerfStats();
 
         // Converting the structure into an array makes it easier to pass it to the frontend
-        double stats[9] = {results.system_fps,      results.game_fps,
+        double stats[8] = {results.system_fps,      results.game_fps,
                            results.emulation_speed, results.time_vblank_interval,
                            results.time_hle_svc,    results.time_hle_ipc,
-                           results.time_gpu,        results.time_swap,
+                           results.time_gpu,        results.time_remaining};
-                           results.time_remaining};
 
-        env->SetDoubleArrayRegion(j_stats, 0, 9, stats);
+        env->SetDoubleArrayRegion(j_stats, 0, 8, stats);
     }
 
     return j_stats;
@@ -892,31 +794,4 @@ void Java_org_citra_citra_1emu_NativeLibrary_disableTemporaryFrameLimit(JNIEnv*
     Settings::is_temporary_frame_limit = false;
 }
 
-void Java_org_citra_citra_1emu_NativeLibrary_playTimeManagerInit(JNIEnv* env, jobject obj) {
-    play_time_manager = std::make_unique<PlayTime::PlayTimeManager>();
-}
-
-void Java_org_citra_citra_1emu_NativeLibrary_playTimeManagerStart(JNIEnv* env, jobject obj,
-                                                                  jlong title_id) {
-    ptm_current_title_id = title_id;
-    if (play_time_manager) {
-        play_time_manager->SetProgramId(static_cast<u64>(title_id));
-        play_time_manager->Start();
-    }
-}
-
-void Java_org_citra_citra_1emu_NativeLibrary_playTimeManagerStop(JNIEnv* env, jobject obj) {
-    play_time_manager->Stop();
-}
-
-jlong Java_org_citra_citra_1emu_NativeLibrary_playTimeManagerGetPlayTime(JNIEnv* env, jobject obj,
-                                                                         jlong title_id) {
-    return static_cast<jlong>(play_time_manager->GetPlayTime(title_id));
-}
-
-jlong Java_org_citra_citra_1emu_NativeLibrary_playTimeManagerGetCurrentTitleId(JNIEnv* env,
-                                                                               jobject obj) {
-    return ptm_current_title_id;
-}
-
 } // extern "C"

src/android/app/src/main/res/layout-w600dp/page_setup.xml

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/left_content"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/right_content"
-        app:layout_constraintHorizontal_weight="2">
-
-        <ImageView
-            android:id="@+id/icon"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="32dp"
-            app:layout_constraintBottom_toTopOf="@+id/text_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_max="160dp"
-            app:layout_constraintHeight_min="80dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_max="160dp"
-            app:layout_constraintWidth_min="80dp"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:layout_constraintVertical_weight="3"
-            tools:src="@drawable/ic_notification" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text_title"
-            style="@style/TextAppearance.Material3.DisplaySmall"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:textColor="?attr/colorOnSurface"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toTopOf="@+id/text_description"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/icon"
-            tools:text="@string/welcome" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text_description"
-            style="@style/TextAppearance.Material3.TitleLarge"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="16dp"
-            android:textAlignment="center"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toTopOf="@+id/text_confirmation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_title"
-            app:lineHeight="30sp"
-            tools:text="@string/welcome_description" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text_confirmation"
-            style="@style/TextAppearance.Material3.TitleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingHorizontal="16dp"
-            android:text="@string/step_complete"
-            android:textAlignment="center"
-            android:textSize="30sp"
-            android:textStyle="bold"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_description"
-            app:lineHeight="30sp" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <LinearLayout
-        android:id="@+id/right_content"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:padding="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/left_content"
-        app:layout_constraintHorizontal_weight="1">
-
-        <LinearLayout
-            android:id="@+id/page_button_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:gravity="center" />
-
-    </LinearLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>

src/android/app/src/main/res/layout/dialog_about_game.xml

@@ -44,8 +44,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAlignment="viewStart"
-                android:textSize="15sp"
+                android:textSize="20sp"
-                android:textStyle="bold"                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="Application Title" />
 
@@ -85,24 +85,6 @@
                 app:layout_constraintTop_toBottomOf="@+id/about_game_id"
                 tools:text="Application Filename" />
 
-            <TextView
-                android:id="@+id/about_game_filetype"
-                style="?attr/textAppearanceBodyMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintStart_toStartOf="@id/about_game_title"
-                app:layout_constraintTop_toBottomOf="@+id/about_game_filename"
-                tools:text="Game Filetype" />
-
-            <TextView
-                android:id="@+id/about_game_playtime"
-                style="?attr/textAppearanceBodyMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintStart_toStartOf="@id/about_game_title"
-                app:layout_constraintTop_toBottomOf="@+id/about_game_filetype"
-                tools:text="Game Playtime" />
-
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout

src/android/app/src/main/res/menu/menu_overlay_options.xml

@@ -86,10 +86,6 @@
         android:id="@+id/menu_emulation_adjust_opacity"
         android:title="@string/emulation_control_opacity" />
 
-    <item
-        android:id="@+id/menu_emulation_button_sliding"
-        android:title="@string/emulation_button_sliding">
-    </item>
     <group android:checkableBehavior="all">
         <item
             android:id="@+id/menu_emulation_joystick_rel_center"

src/android/app/src/main/res/values-b+ca+ES+valencia/strings.xml

@@ -193,9 +193,6 @@
     <string name="region_mismatch">Advertiment Regió No Vàlida</string>
     <string name="region_mismatch_emulated">La configuració del país no és vàlida per a la regió emulada seleccionada.</string>
     <string name="region_mismatch_console">La configuració del país no és vàlida per a la consola vinculada actual.</string>
-    <string name="storage">Emmagatzematge</string>
-    <string name="compress_cia_installs">Comprimir el contingut de CIAs instal·lats</string>
-    <string name="compress_cia_installs_description">Comprimix el contingut de fitxers CIA quan són instal·lats a la SD emulada. Només afecta contingut CIA instal·lat amb esta opció activada.</string>
 
     <!-- Camera settings strings -->
     <string name="inner_camera">Càmera interior</string>
@@ -401,10 +398,6 @@ S\'esperen errors gràfics temporals quan estigue activat.</string>
     <string name="emulation_configure_controls">Configurar Controls</string>
     <string name="emulation_edit_layout">Editar Estil</string>
     <string name="emulation_done">Fet</string>
-    <string name="emulation_button_sliding">Lliscament de botons</string>
-    <string name="emulation_button_sliding_disabled">Mantindre el botó pressionat originalment</string>
-    <string name="emulation_button_sliding_enabled">Mantindre el botó pressionat actualment</string>
-    <string name="emulation_button_sliding_alternative">Mantindre el botó original i actualment pressionat</string>
     <string name="emulation_toggle_controls">Activar Controls</string>
     <string name="emulation_control_scale">Ajustar Escala</string>
     <string name="emulation_control_scale_global">Escala Global</string>
@@ -417,8 +410,6 @@ S\'esperen errors gràfics temporals quan estigue activat.</string>
     <string name="emulation_aspect_ratio">Relació d\'Aspecte</string>
     <string name="emulation_switch_screen_layout">Estil de Pantalla Apaïsada</string>
     <string name="emulation_switch_portrait_layout">Estil de Pantalla de Perfil</string>
-    <string name="emulation_switch_secondary_layout">Estil de Pantalla Secundària</string>
-    <string name="emulation_switch_secondary_layout_description">La disposició de la pantalla secundària connectada, amb cable o sense fil (Chromecast, Miracast)</string>
     <string name="emulation_screen_layout_largescreen">Pantalla amplia</string>
     <string name="emulation_screen_layout_portrait">Vertical</string>
     <string name="emulation_screen_layout_single">Pantalla Única</string>
@@ -426,7 +417,6 @@ S\'esperen errors gràfics temporals quan estigue activat.</string>
     <string name="emulation_screen_layout_hybrid">Pantalles híbrides</string>
     <string name="emulation_screen_layout_original">Original</string>
     <string name="emulation_portrait_layout_top_full">Per omissió</string>
-    <string name="emulation_secondary_display_default">Per defecte del sistema (espill)</string>
     <string name="emulation_screen_layout_custom">Estil Personalitzat</string>
     <string name="emulation_small_screen_position">Posició de Pantalla Xicoteta</string>
     <string name="small_screen_position_description">On hauria d\'aparéixer la pantalla xicoteta en relació amb la gran en Proporció de Pantalla Gran?</string>
@@ -522,6 +512,7 @@ S\'esperen errors gràfics temporals quan estigue activat.</string>
     <string name="save_load_error">Error de guardat/càrrega</string>
     <string name="fatal_error">Error Fatal</string>
     <string name="fatal_error_message">Ha ocorregut un error fatal. Mira el registre per a més detalls.\nSeguir amb l\'emulació podria resultar en diversos penges i problemes.</string>
+    <string name="invalid_region">Regió no vàlida</string>
     <string name="unsupported_encrypted">Aplicació cifrada no suportada</string>
 
     <!-- Disk Shader Cache -->
@@ -547,9 +538,6 @@ S\'esperen errors gràfics temporals quan estigue activat.</string>
     <string name="create_shortcut">Crear drecera</string>
     <string name="shortcut_name_empty">El nom de la drecera no pot estar buit</string>
     <string name="shortcut_image_stretch_toggle">Allargar per a ajustar la imatge</string>
-    <string name="game_context_id">ID:</string>
-    <string name="game_context_file">Fitxer:</string>
-    <string name="game_context_type">Tipus:</string>
 
     <!-- Performance Overlay settings -->
     <string name="performance_overlay_show">Mostrar informació de rendiment</string>

src/android/app/src/main/res/values-b+da+DK/strings.xml

@@ -74,10 +74,6 @@
     <string name="permission_denied">Tilladelse nægtet</string>
     <string name="add_games_warning">Vil du droppe at vælge applikationsmappen?</string>
     <string name="add_games_warning_description">Software vil ikke blive vist på applikationslisten, hvis en mappe ikke er valgt.</string>
-    <string name="permissions">Tilladelser</string>
-    <string name="select_emulator_data_folders">Datamapper</string>
-    <string name="select_emulator_data_folders_description"><![CDATA[Vælg datamapper<br/>(Brugermappe er påkrævet)]]></string>
-    <string name="permissions_description">Giv valgfrie tilladelser til at bruge specifikke funktioner i emulatoren</string>
     <string name="warning_help">Hjælp</string>
     <string name="warning_skip">Spring over</string>
     <string name="warning_cancel">Annuller</string>
@@ -87,7 +83,6 @@
     <string name="keep_current_azahar_directory">Behold den aktuelle Azahar-mappe</string>
     <string name="use_prior_lime3ds_directory">Brug tidligere Lime3DS mappe</string>
     <string name="select">Vælg</string>
-    <string name="cannot_skip">Du kan ikke springe opsætningen af ​​brugermappen over </string>
     <string name="cannot_skip_directory_description">Dette trin er påkrævet for at Azahar kan fungere. Vælg en mappe og så kan du fortsætte.</string>
     <string name="selecting_user_directory_without_write_permissions">Du har mistet skrivetilladelse i din <a href="https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage">brugerdata</a> mappe, hvor gemte tilstande og anden information er gemt. Dette kan ske efter en app- eller Android-opdatering. Vælg venligst mappen for at give tilladelse igen, så du kan fortsætte.</string>
     <string name="set_up_theme_settings">Temaindstillinger</string>
@@ -193,6 +188,7 @@
     <string name="region_mismatch">Advarsel om uoverensstemmelse i region</string>
     <string name="region_mismatch_emulated">Landeindstillingen er ikke gyldig for det valgte emulerede område.</string>
     <string name="region_mismatch_console">Landeindstillingen er ikke gyldig for den aktuelle forbundne konsol.</string>
+
     <!-- Camera settings strings -->
     <string name="inner_camera">Indre kamera</string>
     <string name="outer_left_camera">Ydre venstre kamera</string>
@@ -211,8 +207,6 @@
     <string name="graphics_api">Grafik API</string>
     <string name="spirv_shader_gen">Aktiver generering af SPIR-V shader</string>
     <string name="spirv_shader_gen_description">Udsender den fragment shader, der bruges til at emulere PICA med SPIR-V i stedet for GLSL</string>
-    <string name="disable_spirv_optimizer">Deaktiver SPIR-V Optimeringsværktøj</string>
-    <string name="disable_spirv_optimizer_description">Deaktiverer SPIR-V-optimeringspasset, hvilket reducerer hakken betydeligt, mens ydeevnen næsten ikke påvirkes.</string>
     <string name="async_shaders">Aktiver asynkron shader kompilering</string>
     <string name="async_shaders_description">Kompilerer shaders i baggrunden for at reducere hakken under spilet. Når det er aktiveret, skal du forvente tilfældige grafiske fejl</string>
     <string name="linear_filtering">Lineær filtrering</string>
@@ -221,7 +215,6 @@
     <string name="texture_filter_description">Forbedrer det visuelle i applikationer ved at anvende et filter på teksturer. De understøttede filtre er Anime4K Ultrafast, Bicubic, ScaleForce, xBRZ freescale og MMPX.</string>
     <string name="delay_render_thread">Forsinket spillets renderingstråd</string>
     <string name="delay_render_thread_description">Forsink spillets remderingstråd, når den sender data til GPU\'en. Hjælper med ydeevneproblemer i de (meget få) applikationer med dynamiske framerates.</string>
-    <string name="advanced">Avanceret</string>
     <string name="texture_sampling_name">Tekstur sampling</string>
     <string name="texture_sampling_description">Tilsidesætter det samplingsfilter, der bruges af spillene. Dette kan i nogle tilfælde være nyttigt for spil, der ikke håndterer opskalering godt. Hvis du er usikker, skal du indstille dette til Styret af spillene.</string>
     <string name="shaders_accurate_mul">Nøjagtig multiplikation</string>
@@ -304,9 +297,6 @@
     <string name="deterministic_async_operations_description">Gør asynkrone operationer deterministiske for fejlretning. Aktivering af dette kan forårsage at programmet fryser fast.</string>
     <string name="enable_rpc_server">Aktivér RPC-server</string>
     <string name="enable_rpc_server_desc">Aktiverer RPC-serveren på port 45987. Dette tillader fjernlæsning/skrivning af gæstehukommelse.</string>
-    <string name="shader_jit">Aktiver shader-JIT</string>
-    <string name="shader_jit_description">Brug JIT-motoren i stedet for fortolkeren til software-shader-emulering.</string>
-
     <!-- Layout settings strings -->
     <string name="layout_screen_orientation">Skærmorientering</string>
     <string name="layout_screen_orientation_auto_sensor">Automatisk</string>
@@ -441,7 +431,6 @@
     <string name="emulation_custom_layout_height">Højde</string>
     <string name="emulation_cycle_landscape_layouts">Skift layout</string>
     <string name="emulation_swap_screens">Byt skærme</string>
-    <string name="emulation_rotate_upright">Roter skærmen oprejst</string>
     <string name="emulation_touch_overlay_reset">Nulstil overlejring</string>
     <string name="emulation_show_controller_overlay">Vis controller-overlejring</string>
     <string name="emulation_close_game">Luk spil</string>
@@ -510,6 +499,7 @@
     <string name="save_load_error">Gem/indlæs fejl</string>
     <string name="fatal_error">Fatal fejl</string>
     <string name="fatal_error_message">Der opstod en fatal fejl. Kontroller loggen for detaljer.\nFortsat emulering kan resultere i nedbrud og fejl.</string>
+    <string name="invalid_region">Ugyldig region</string>
     <string name="unsupported_encrypted">Ikke understøttet krypteret applikation</string>
 
     <!-- Disk Shader Cache -->
@@ -530,11 +520,6 @@
     <string name="game_context_uninstall_dlc">Afinstaller DLC</string>
     <string name="game_context_uninstall_updates">Afinstaller opdateringer</string>
     <string name="shortcut">Genvej</string>
-    <string name="shortcut_name">Genvejsnavn</string>
-    <string name="edit_icon">Rediger ikon</string>
-    <string name="create_shortcut">Opret genvej</string>
-    <string name="shortcut_name_empty">Genvejsnavnet må ikke være tomt</string>
-    <string name="shortcut_image_stretch_toggle">Stræk for at tilpasse billedet</string>
     <!-- Performance Overlay settings -->
     <string name="performance_overlay_show">Vis ydelsesoverlejring</string>
     <string name="performance_overlay_options">Ydelsesoverlejring</string>

src/android/app/src/main/res/values-b+es+ES/strings.xml

@@ -193,9 +193,6 @@
     <string name="region_mismatch">Advertencia Región No Válida</string>
     <string name="region_mismatch_emulated">La configuración del país no es válida para la región emulada seleccionada.</string>
     <string name="region_mismatch_console">La configuración del país no es válida para la consola vinculada actual.</string>
-    <string name="storage">Almacenamiento</string>
-    <string name="compress_cia_installs">Comprimir el contenido de CIAs instalados</string>
-    <string name="compress_cia_installs_description">Comprime el contenido de archivos CIA cuando son instalados a la SD emulada. Solo afecta contenido CIA instalado con esta opción activada.</string>
 
     <!-- Camera settings strings -->
     <string name="inner_camera">Cámara interior</string>
@@ -401,10 +398,6 @@ Se esperan fallos gráficos temporales cuando ésta esté activado.</string>
     <string name="emulation_configure_controls">Configurar Controles</string>
     <string name="emulation_edit_layout">Editar Estilo</string>
     <string name="emulation_done">Hecho</string>
-    <string name="emulation_button_sliding">Deslizamiento de botones</string>
-    <string name="emulation_button_sliding_disabled">Mantener el botón presionado originalmente</string>
-    <string name="emulation_button_sliding_enabled">Mantener el botón presionado actualmente</string>
-    <string name="emulation_button_sliding_alternative">Mantener el botón original y actualmente presionado</string>
     <string name="emulation_toggle_controls">Activar Controles</string>
     <string name="emulation_control_scale">Ajustar Escala</string>
     <string name="emulation_control_scale_global">Escala Global</string>
@@ -417,8 +410,6 @@ Se esperan fallos gráficos temporales cuando ésta esté activado.</string>
     <string name="emulation_aspect_ratio">Relación de Aspecto</string>
     <string name="emulation_switch_screen_layout">Estilo de Pantalla Apaisada</string>
     <string name="emulation_switch_portrait_layout">Estilo de Pantalla de Perfil</string>
-    <string name="emulation_switch_secondary_layout">Estilo de Pantalla Secundaria</string>
-    <string name="emulation_switch_secondary_layout_description">El estilo de la pantalla secundaria conectada, con cable o inalámbrica (Chromecast, Miracast)</string>
     <string name="emulation_screen_layout_largescreen">Pantalla amplia</string>
     <string name="emulation_screen_layout_portrait">Retrato</string>
     <string name="emulation_screen_layout_single">Pantalla Única</string>
@@ -426,7 +417,6 @@ Se esperan fallos gráficos temporales cuando ésta esté activado.</string>
     <string name="emulation_screen_layout_hybrid">Pantallas híbridas</string>
     <string name="emulation_screen_layout_original">Original</string>
     <string name="emulation_portrait_layout_top_full">Por defecto</string>
-    <string name="emulation_secondary_display_default">Por defecto del sistema (espejo)</string>
     <string name="emulation_screen_layout_custom">Estilo personalizado</string>
     <string name="emulation_small_screen_position">Posición Pantalla Pequeña</string>
     <string name="small_screen_position_description">¿Dónde debería aparecer la pantalla pequeña en relación con la grande en Disposicion de Pantalla Grande?</string>
@@ -522,6 +512,7 @@ Se esperan fallos gráficos temporales cuando ésta esté activado.</string>
     <string name="save_load_error">Error de guardado/carga</string>
     <string name="fatal_error">Error Fatal</string>
     <string name="fatal_error_message">Ha ocurrido un error fatal. Mira el registro para más detalles.\nSeguir con la emulación podría resultar en diversos cuelgues y bugs.</string>
+    <string name="invalid_region">Región no válida</string>
     <string name="unsupported_encrypted">Aplicación encriptada no soportada</string>
 
     <!-- Disk Shader Cache -->
@@ -547,9 +538,6 @@ Se esperan fallos gráficos temporales cuando ésta esté activado.</string>
     <string name="create_shortcut">Crear atajo</string>
     <string name="shortcut_name_empty">El nombre del atajo no puede estar vacío</string>
     <string name="shortcut_image_stretch_toggle">Alargar para ajustar la imagen</string>
-    <string name="game_context_id">ID:</string>
-    <string name="game_context_file">Archivo:</string>
-    <string name="game_context_type">Tipo:</string>
 
     <!-- Performance Overlay settings -->
     <string name="performance_overlay_show">Mostrar información de rendimiento</string>

src/android/app/src/main/res/values-b+pl+PL/strings.xml

@@ -193,9 +193,6 @@
     <string name="region_mismatch">Ostrzeżenie o niedopasowaniu regionów</string>
     <string name="region_mismatch_emulated">Ustawienie kraju nie jest prawidłowe dla wybranego emulowanego regionu.</string>
     <string name="region_mismatch_console">Ustawienie kraju nie jest prawidłowe dla aktualnie podłączonej konsoli.</string>
-    <string name="storage">Miejsce</string>
-    <string name="compress_cia_installs">Kompresuj zainstalowaną zawartość CIA</string>
-    <string name="compress_cia_installs_description">Kompresuje zawartość plików CIA zainstalowanych na emulowanej karcie SD. Ma wpływ tylko na zawartość CIA, która jest instalowana, gdy ustawienie jest włączone.</string>
 
     <!-- Camera settings strings -->
     <string name="inner_camera">Kamera wewnętrzna</string>
@@ -400,10 +397,6 @@
     <string name="emulation_configure_controls">Konfiguracja sterowania</string>
     <string name="emulation_edit_layout">Edytuj układ</string>
     <string name="emulation_done">Gotowe</string>
-    <string name="emulation_button_sliding">Przesuwanie przycisków</string>
-    <string name="emulation_button_sliding_disabled">Przytrzymuje pierwotnie naciśnięty przycisk</string>
-    <string name="emulation_button_sliding_enabled">przytrzymuje aktualnie naciśnięty przycisk</string>
-    <string name="emulation_button_sliding_alternative">Przytrzymuje oryginalny i aktualnie naciśnięty przycisk</string>
     <string name="emulation_toggle_controls">Przełącz sterowanie</string>
     <string name="emulation_control_scale">Dostosuj Skalę</string>
     <string name="emulation_control_scale_global">Ogólna Skala</string>
@@ -416,8 +409,6 @@
     <string name="emulation_aspect_ratio">Proporcje obrazu</string>
     <string name="emulation_switch_screen_layout">Geometryczny Układ Ekranu</string>
     <string name="emulation_switch_portrait_layout">Pionowy Układ Ekranu</string>
-    <string name="emulation_switch_secondary_layout">Układ ekranu wyświetlacza dodatkowego</string>
-    <string name="emulation_switch_secondary_layout_description">Układ używany przez podłączony dodatkowy ekran, przewodowy lub bezprzewodowy (Chromecast, Miracast)</string>
     <string name="emulation_screen_layout_largescreen">Duży Ekran</string>
     <string name="emulation_screen_layout_portrait">Ekran</string>
     <string name="emulation_screen_layout_single">Pojedynczy ekran</string>
@@ -425,7 +416,6 @@
     <string name="emulation_screen_layout_hybrid">Hybrydowy Ekran</string>
     <string name="emulation_screen_layout_original">Oryginalny</string>
     <string name="emulation_portrait_layout_top_full">Domyślny</string>
-    <string name="emulation_secondary_display_default">Ustawienia domyślne systemu (mirror)</string>
     <string name="emulation_screen_layout_custom">Niestandardowy Układ</string>
     <string name="emulation_small_screen_position">Pozycja małego ekranu</string>
     <string name="small_screen_position_description">Gdzie powinien być wyświetlany mały ekran względem dużego w układzie dużego ekranu?</string>
@@ -521,6 +511,7 @@
     <string name="save_load_error">Błąd zapisywania/wczytywania</string>
     <string name="fatal_error">Krytyczny Błąd</string>
     <string name="fatal_error_message">Wystąpił błąd krytyczny. Kontynuowanie emulacji może spowodować awarie i błędy.</string>
+    <string name="invalid_region">Nieprawidłowy region</string>
     <string name="unsupported_encrypted">Nieobsługiwana zaszyfrowana aplikacja</string>
 
     <!-- Disk Shader Cache -->
@@ -546,9 +537,6 @@
     <string name="create_shortcut">Utwórz skrót</string>
     <string name="shortcut_name_empty">Nazwa skrótu nie może być pusta</string>
     <string name="shortcut_image_stretch_toggle">Rozciągnij, aby dopasować obraz</string>
-    <string name="game_context_id">ID:</string>
-    <string name="game_context_file">Plik:</string>
-    <string name="game_context_type">Typ:</string>
 
     <!-- Performance Overlay settings -->
     <string name="performance_overlay_show">Wyświetl nakładkę wydajności</string>

src/android/app/src/main/res/values-b+pt+BR/strings.xml

@@ -11,13 +11,13 @@
     <string name="home_options">Opções</string>
     <string name="home_search">Procurar</string>
     <string name="home_games">Aplicativos</string>
-    <string name="settings_description">Definir as configurações do emulador</string>
+    <string name="settings_description">Definir configurações do emulador</string>
-    <string name="install_game_content">Instalar arquivo CIA</string>
+    <string name="install_game_content">Instale o arquivo CIA</string>
     <string name="install_game_content_description">Instalar aplicativos, atualizações ou DLC</string>
-    <string name="share_log">Compartilhar Registro</string>
+    <string name="share_log">Compartilhar registro</string>
     <string name="share_log_description">Compartilhe o arquivo de log do Azahar para depurar problemas</string>
-    <string name="gpu_driver_manager">Gerenciador de Driver da GPU</string>
+    <string name="gpu_driver_manager">Gerenciador de driver da GPU</string>
-    <string name="install_gpu_driver">Instalar driver da GPU</string>
+    <string name="install_gpu_driver">Instale o driver da GPU</string>
     <string name="install_gpu_driver_description">Instale drivers alternativos para poder obter desempenho ou precisão</string>
     <string name="driver_already_installed">Driver já instalado</string>
     <string name="custom_driver_not_supported">Drivers personalizados não suportados</string>
@@ -27,15 +27,15 @@
     <string name="select_games_folder_description">Permitir que o Azahar preencha a lista de aplicativos</string>
     <string name="about">Sobre</string>
     <string name="citra_description">Um emulador de 3DS de código aberto</string>
-    <string name="about_description">Versão da compilação, créditos e mais</string>
+    <string name="about_description">Versão de compilação, créditos e mais</string>
-    <string name="games_dir_selected">Diretório do aplicativo selecionado</string>
+    <string name="games_dir_selected">Diretório de aplicativos selecionado</string>
     <string name="select_citra_user_folder_home_description">Altera os arquivos que o Azahar usa para carregar aplicativos</string>
     <string name="theme_and_color_description">Modificar a aparência do aplicativo</string>
-    <string name="install_cia_title">Instalar arquivo CIA</string>
+    <string name="install_cia_title">Instale a CIA</string>
     <string name="warning_3ds_files"><![CDATA[Arquivos criptografados e arquivos .3ds não são mais suportados. Talvez seja necessário descriptografá-los e/ou renomeá-los para .cci. <a href=\"https://azahar-emu.org/blog/game-loading-changes/\">Saiba mais.</a>]]></string>
 
     <!-- GPU driver installation -->
-    <string name="select_gpu_driver">Selecionar driver da GPU</string>
+    <string name="select_gpu_driver">Selecione o driver GPU</string>
     <string name="select_gpu_driver_title">Você quer substituir seu driver de GPU atual?</string>
     <string name="select_gpu_driver_install">Instalar</string>
     <string name="select_gpu_driver_default">Padrão</string>
@@ -77,7 +77,6 @@
     <string name="permissions">Premissões</string>
     <string name="select_emulator_data_folders">Pastas de Dados</string>
     <string name="select_emulator_data_folders_description"><![CDATA[Selecione pastas de dados<br/>(Pasta de usuário é necessária)]]></string>
-    <string name="permissions_description">Conceda permissões opcionais para usar recursos específicos do emulador.</string>
     <string name="warning_help">Ajuda</string>
     <string name="warning_skip">Pular</string>
     <string name="warning_cancel">Cancelar</string>
@@ -87,7 +86,6 @@
     <string name="keep_current_azahar_directory">Manter diretório atual do Azahar</string>
     <string name="use_prior_lime3ds_directory">Usar o diretório antigo do Lime3DS</string>
     <string name="select">Selecionar</string>
-    <string name="cannot_skip">Você não pode pular a configuração da pasta do usuário.</string>
     <string name="cannot_skip_directory_description">Este passo é necessário para permitir que o Azahar funcione. Selecione um diretório para continuar.</string>
     <string name="selecting_user_directory_without_write_permissions">Você perdeu suas permissões de escrita no seu diretório de <a href="https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage">dados de usuário</a>, onde dados salvos e outras informações são guardadas.  Isso pode acontecer depois que algum app ou Android atualiza. Re-selecione o diretório para reobter as permissões para que você possa continuar.</string>
     <string name="set_up_theme_settings">Configurações de Tema</string>
@@ -169,7 +167,6 @@
     <string name="init_clock_description">Configura o relógio emulado do 3DS para refletir o do seu dispositivo ou para começar numa data e hora simulados.</string>
     <string name="device_clock">Clock do Dispositivo</string>
     <string name="simulated_clock">Clock Simulado</string>
-    <string name="simulated_clock_description">Se o relógio estiver definido como \'Relógio simulado\', isso altera a data e hora fixas de início.</string>
     <string name="profile_settings">Configurações de Perfil</string>
     <string name="emulated_region">Região</string>
     <string name="emulated_language">Linguagem</string>
@@ -193,6 +190,7 @@
     <string name="region_mismatch">Aviso de inconsistência de região</string>
     <string name="region_mismatch_emulated">O país configurado não é válido para a região emulada selecionada.</string>
     <string name="region_mismatch_console">O país configurado não é válido para o console vinculado atual.</string>
+
     <!-- Camera settings strings -->
     <string name="inner_camera">Câmera frontal</string>
     <string name="outer_left_camera">Câmera traseira esquerda</string>
@@ -211,8 +209,6 @@
     <string name="graphics_api">API de gráficos</string>
     <string name="spirv_shader_gen">Ativar geração de shaders SPIR-V</string>
     <string name="spirv_shader_gen_description">Emite o fragment shader usado para emular PICA usando SPIR-V em vez de GLSL</string>
-    <string name="disable_spirv_optimizer">Desativar otimizador SPIR-V</string>
-    <string name="disable_spirv_optimizer_description">Desativa a etapa de otimização SPIR-V, reduzindo consideravelmente os travamentos, com impacto mínimo no desempenho.</string>
     <string name="async_shaders">Ativar a compilação assíncrona de shaders</string>
     <string name="async_shaders_description">Compila shaders em segundo plano para reduzir travamentos durante o jogo. Quando ativado, espere falhas gráficas temporárias</string>
     <string name="linear_filtering">Filtragem Linear</string>
@@ -233,7 +229,6 @@
     <string name="frame_limit_slider">Limite de velocidade percentual</string>
     <string name="frame_limit_slider_description">Especifica a porcentagem para limitar a velocidade. Com o padrão de 100% a emulação será limitada a velocidade normal. Valores maiores ou menores vão aumentar ou reduzir o limite de velocidade.</string>
     <string name="turbo_limit">Limite da Velocidade Turbo:</string>
-    <string name="turbo_limit_description">Limite de velocidade da emulação usado enquanto a tecla de atalho turbo está ativa.</string>
     <string name="expand_to_cutout_area">Expandir para a área recortada</string>
     <string name="expand_to_cutout_area_description">Expande a área da tela para incluir a área recortada (ou notch).</string>
     <string name="internal_resolution">Resolução Interna</string>
@@ -302,11 +297,6 @@
     <string name="delay_start_lle_modules_description">Atrasa a inicialização do aplicativo quando os módulos LLE estão ativados.</string>
     <string name="deterministic_async_operations">Operações Assíncronas Determinísticas</string>
     <string name="deterministic_async_operations_description">Torna as operações assíncronas determinísticas para depuração. Ativar essa opção pode causar congelamentos.</string>
-    <string name="enable_rpc_server">Ativar servidor RPC</string>
-    <string name="enable_rpc_server_desc">Ativa o servidor RPC na porta 45987. Isso permite ler e escrever remotamente a memória do sistema emulado.</string>
-    <string name="shader_jit">Ativar Shader JIT</string>
-    <string name="shader_jit_description">Usa o mecanismo JIT em vez do interpretador para a emulação de shaders por software.</string>
-
     <!-- Layout settings strings -->
     <string name="layout_screen_orientation">Orientação da Tela</string>
     <string name="layout_screen_orientation_auto_sensor">Automático</string>
@@ -426,8 +416,6 @@
     <string name="small_screen_position_bottom_left">Inferior Esquerda</string>
     <string name="small_screen_position_above">Acima</string>
     <string name="small_screen_position_below">Abaixo</string>
-    <string name="screen_gap">Espaço entre Telas</string>
-    <string name="screen_gap_description">Espaço entre as telas em todos os modos de duas telas. Medido em pixels em relação à altura de 240 pixels da tela maior.</string>
     <string name="large_screen_proportion">Proporção de Tela Grande</string>
     <string name="large_screen_proportion_description">Quantas vezes maior é a tela grande em relação à tela pequena no Layout de Tela Grande?</string>
     <string name="emulation_adjust_custom_layout">Ajuste a Disposição Personalizada nas Configurações</string>
@@ -441,9 +429,7 @@
     <string name="emulation_custom_layout_height">Altura</string>
     <string name="emulation_cycle_landscape_layouts">Trocar Disposições</string>
     <string name="emulation_swap_screens">Trocar telas</string>
-    <string name="emulation_rotate_upright">Girar Tela para Posição Vertical</string>
     <string name="emulation_touch_overlay_reset">Redefinir sobreposição</string>
-    <string name="emulation_show_controller_overlay">Mostrar Sobreposição do Controle</string>
     <string name="emulation_close_game">Fechar jogo</string>
     <string name="emulation_toggle_pause">Alternar Pausa</string>
     <string name="miscellaneous">Diversos</string>
@@ -510,6 +496,7 @@
     <string name="save_load_error">Erro ao Salvar/Carregar</string>
     <string name="fatal_error">Erro Fatal</string>
     <string name="fatal_error_message">Ocorreu um erro fatal. Verifique o registro para obter detalhes.\nContinuar a emulação pode resultar em falhas e bugs.</string>
+    <string name="invalid_region">Região inválida</string>
     <string name="unsupported_encrypted">Aplicativo criptografado não suportado</string>
 
     <!-- Disk Shader Cache -->
@@ -530,39 +517,6 @@
     <string name="game_context_uninstall_dlc">Desinstalar DLC</string>
     <string name="game_context_uninstall_updates">Desinstalar atualizações</string>
     <string name="shortcut">Atalho</string>
-    <string name="shortcut_name">Nome do Atalho</string>
-    <string name="edit_icon">Editar ícone</string>
-    <string name="create_shortcut">Criar Atalho</string>
-    <string name="shortcut_name_empty">O nome do atalho não pode ficar vazio</string>
-    <string name="shortcut_image_stretch_toggle">Esticar para ajustar à imagem</string>
-    <!-- Performance Overlay settings -->
-    <string name="performance_overlay_show">Mostrar Sobreposição de Desempenho</string>
-    <string name="performance_overlay_options">Sobreposição de Desempenho</string>
-    <string name="performance_overlay_enable">Ativa a Sobreposição de Desempenho</string>
-    <string name="performance_overlay_options_description">Configure se a sobreposição de desempenho será exibida e quais informações serão mostradas.</string>
-    <string name="overlay_show_fps">Mostrar FPS</string>
-    <string name="overlay_show_fps_description">Exibe a taxa de quadros atual por segundo.</string>
-    <string name="overlay_show_frametime">Mostrar Tempo de Quadro</string>
-    <string name="overlay_show_frametime_description">Exibe o tempo de quadro atual.</string>
-    <string name="overlay_show_speed">Mostrar Velocidade</string>
-    <string name="overlay_show_speed_description">Exibe a porcentagem atual da velocidade da emulação.</string>
-    <string name="overlay_show_app_ram_usage">Mostrar o Uso de Memória do Aplicativo</string>
-    <string name="overlay_show_app_ram_usage_description">Exibe a quantidade de RAM utilizada pelo emulador.</string>
-    <string name="overlay_show_available_ram">Mostrar Memória Disponível</string>
-    <string name="overlay_show_available_ram_description">Exibe a quantidade de RAM disponível.</string>
-    <string name="overlay_show_battery_temp">Mostrar a Temperatura da Bateria</string>
-    <string name="overlay_show_battery_temp_description">Exibe a temperatura atual da Bateria em Celsius e Fahrenheit.</string>
-    <string name="overlay_position">Posição da Sobreposição</string>
-    <string name="overlay_position_description">Escolha onde a sobreposição de desempenho será exibida na tela.</string>
-    <string name="overlay_position_top_left">Superior Esquerdo</string>
-    <string name="overlay_position_top_right">Superior Direito</string>
-    <string name="overlay_position_bottom_left">Inferior Esquerdo</string>
-    <string name="overlay_position_bottom_right">Inferior Direito</string>
-    <string name="overlay_position_center_top">Centro Superior</string>
-    <string name="overlay_position_center_bottom">Centro Inferior</string>
-    <string name="overlay_background">Plano de Fundo da Sobreposição</string>
-    <string name="overlay_background_description">Adiciona um plano de fundo atrás da sobreposição para facilitar a leitura.</string>
-
     <!-- Cheats -->
     <string name="cheats">Truques</string>
     <string name="cheats_add">Adicionar Trapaça</string>

src/android/app/src/main/res/values-b+tr+TR/strings.xml

@@ -185,6 +185,7 @@
     <string name="region_mismatch">Bölge Uyuşmazlık Uyarısı</string>
     <string name="region_mismatch_emulated">Ülke ayarı emülasyon bölgesi için geçerli değil.</string>
     <string name="region_mismatch_console">Ülke ayarı bağlı olan konsol için geçerli değil.</string>
+
     <!-- Camera settings strings -->
     <string name="inner_camera"> 
 İç Kamera</string>
@@ -461,6 +462,7 @@
     <string name="save_load_error">Kaydetme/yükleme Hatası</string>
     <string name="fatal_error">Ölümcül Hata</string>
     <string name="fatal_error_message">Ölümcül bir hata oluştu. Ayrıntılar için log\'u kontrol edin.\nEmülasyona devam etmek çökmelere ve hatalara neden olabilir.</string>
+    <string name="invalid_region">Geçersiz bölge</string>
     <string name="unsupported_encrypted">Desteklenmeyen şifreli uygulama</string>
 
     <!-- Disk Shader Cache -->

src/android/app/src/main/res/values-b+zh+CN/strings.xml

@@ -193,9 +193,6 @@
     <string name="region_mismatch">区域不匹配警告</string>
     <string name="region_mismatch_emulated">此国家/地区设置对于所选择的模拟区域无效。</string>
     <string name="region_mismatch_console">此国家/地区设置对于当前关联的掌机无效。</string>
-    <string name="storage">存储</string>
-    <string name="compress_cia_installs">压缩已安装的 CIA 内容</string>
-    <string name="compress_cia_installs_description">安装到模拟 SD 卡时，压缩 CIA 文件的内容。仅影响启用此设置时安装的 CIA 内容。</string>
 
     <!-- Camera settings strings -->
     <string name="inner_camera">内置摄像头</string>
@@ -400,24 +397,18 @@
     <string name="emulation_configure_controls">控制设置</string>
     <string name="emulation_edit_layout">编辑布局</string>
     <string name="emulation_done">完成</string>
-    <string name="emulation_button_sliding">按键滑行</string>
-    <string name="emulation_button_sliding_disabled">按住起始按下的按键</string>
-    <string name="emulation_button_sliding_enabled">按住当前按下的按键</string>
-    <string name="emulation_button_sliding_alternative">按住起始和当前按下的按键</string>
     <string name="emulation_toggle_controls">切换控制</string>
     <string name="emulation_control_scale">调整大小</string>
     <string name="emulation_control_scale_global">全局缩放</string>
     <string name="emulation_control_scale_reset_all">重置全部</string>
     <string name="emulation_control_opacity">调整透明度</string>
     <string name="emulation_control_joystick_rel_center">相对摇杆中心</string>
-    <string name="emulation_control_dpad_slide_enable">十字键滑行</string>
+    <string name="emulation_control_dpad_slide_enable">十字方向键滑动</string>
     <string name="emulation_open_settings">打开设置项</string>
     <string name="emulation_open_cheats">开启金手指</string>
     <string name="emulation_aspect_ratio">宽高比</string>
     <string name="emulation_switch_screen_layout">屏幕布局</string>
     <string name="emulation_switch_portrait_layout">纵向屏幕布局</string>
-    <string name="emulation_switch_secondary_layout">副屏幕布局</string>
-    <string name="emulation_switch_secondary_layout_description">有线或无线连接的辅助屏幕使用布局（Chromecast, Miracast）</string>
     <string name="emulation_screen_layout_largescreen">大屏幕</string>
     <string name="emulation_screen_layout_portrait">纵向</string>
     <string name="emulation_screen_layout_single">单个屏幕</string>
@@ -425,7 +416,6 @@
     <string name="emulation_screen_layout_hybrid">混合式屏幕</string>
     <string name="emulation_screen_layout_original">原始</string>
     <string name="emulation_portrait_layout_top_full">默认</string>
-    <string name="emulation_secondary_display_default">系统默认（镜像）</string>
     <string name="emulation_screen_layout_custom">自定义布局</string>
     <string name="emulation_small_screen_position">小屏幕位置</string>
     <string name="small_screen_position_description">在“大屏幕”布局中，小屏幕相对于大屏幕应该出现的位置？</string>
@@ -523,6 +513,7 @@
     <string name="save_load_error">保存/读取出现错误</string>
     <string name="fatal_error">致命错误</string>
     <string name="fatal_error_message">发生致命错误。请查阅日志获取相关信息。\n继续模拟可能会导致错误和崩溃。</string>
+    <string name="invalid_region">无效的地区</string>
     <string name="unsupported_encrypted">不支持的加密应用</string>
 
     <!-- Disk Shader Cache -->
@@ -548,9 +539,6 @@
     <string name="create_shortcut">创建快捷方式</string>
     <string name="shortcut_name_empty">快捷方式名称不能为空</string>
     <string name="shortcut_image_stretch_toggle">拉伸以适合图像</string>
-    <string name="game_context_id">ID:</string>
-    <string name="game_context_file">文件:</string>
-    <string name="game_context_type">类型:</string>
 
     <!-- Performance Overlay settings -->
     <string name="performance_overlay_show">显示性能参数</string>

src/android/app/src/main/res/values-de/strings.xml

@@ -74,10 +74,6 @@
     <string name="permission_denied">Berechtigung verweigert</string>
     <string name="add_games_warning">Auswahl des Anwendungs Ordner überspringen?</string>
     <string name="add_games_warning_description">Software wird nicht in der Anwendungs Liste angezeigt, wenn kein Ordner ausgewählt ist.</string>
-    <string name="permissions">Berechtigungen</string>
-    <string name="select_emulator_data_folders">Daten Ordner</string>
-    <string name="select_emulator_data_folders_description"><![CDATA[Daten Ordner auswählen<br/>(Nutzer Ordner ist obligatorisch)]]></string>
-    <string name="permissions_description">Optionale Berechtigungen erteilen um spezifische Funktionen des Emulators zu verwenden</string>
     <string name="warning_help">Hilfe</string>
     <string name="warning_skip">Überspringen</string>
     <string name="warning_cancel">Abbrechen</string>
@@ -87,7 +83,6 @@
     <string name="keep_current_azahar_directory">Aktuelles Azahar-Verzeichnis behalten</string>
     <string name="use_prior_lime3ds_directory">Vorheriges Lime3DS-Verzeichnis nutzen</string>
     <string name="select">Auswählen</string>
-    <string name="cannot_skip">Der Nutzer Ordner muss gesetzt sein</string>
     <string name="cannot_skip_directory_description">Dieser Schritt ist nötig, damit Azahar funktionieren kann. Bitte wähle ein Verzeichnis aus, damit du fortfahren kannst.</string>
     <string name="selecting_user_directory_without_write_permissions">Die Schreibrechte auf dein <a href="https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage">Nutzerdaten</a>-Verzeichnis, wo deine Speicherstände und andere Informationen gespeichert sind, fehlen. Dies kann durch ein Anwendungsupdate, oder ein Androidupdate passiert sein. Bitte wähle das Verzeichnis erneut aus, damit die Berechtigungen wiederhergestellt werden können.</string>
     <string name="set_up_theme_settings">Design-Einstellung</string>
@@ -193,6 +188,7 @@
     <string name="region_mismatch">Region passt nicht überein</string>
     <string name="region_mismatch_emulated">Die Ländereinstellung ist für die ausgewählte emulierte Region nicht gültig.</string>
     <string name="region_mismatch_console">Die Ländereinstellung ist für die gekoppelte Konsole ungültig.</string>
+
     <!-- Camera settings strings -->
     <string name="inner_camera">Innenkamera</string>
     <string name="outer_left_camera">Außenkamera Links</string>
@@ -211,8 +207,6 @@
     <string name="graphics_api">Grafik API</string>
     <string name="spirv_shader_gen">SPIR-V-Shader-Generierung aktivieren</string>
     <string name="spirv_shader_gen_description">Gibt den Fragment-Shader aus, der zur Emulation von PICA unter Verwendung von SPIR-V statt GLSL verwendet wird.</string>
-    <string name="disable_spirv_optimizer">SPIR-V Optimierer deaktivieren</string>
-    <string name="disable_spirv_optimizer_description">Deaktiviert den SPIR-V Optimierungsschritt, was stottern reduziert und die Leistung nur geringfügig beeinflusst.</string>
     <string name="async_shaders">Asynchrone GPU-Emulation aktivieren</string>
     <string name="async_shaders_description">Kompiliere Shader im Hintergrund, um das Stottern des Spiels zu reduzieren. Dadurch kann es zu temporären grafischen Fehlern während des Spielens kommen.</string>
     <string name="linear_filtering">Lineare Filterung</string>
@@ -221,7 +215,6 @@
     <string name="texture_filter_description">Verbessert die Optik von Anwendungen durch Anwenden eines Filters auf Texturen. Die unterstützten Filter sind Anime4K Ultrafast, Bicubic, ScaleForce, xBRZ freescale und MMPX.</string>
     <string name="delay_render_thread">Game-Render-Thread verzögern</string>
     <string name="delay_render_thread_description">Verzögert den Render-Thread des Spiels, wenn er Daten an die GPU sendet. Hilft bei Leistungsproblemen in den (sehr wenigen) Anwendungen mit dynamischen Frameraten.</string>
-    <string name="advanced">Erweitert</string>
     <string name="texture_sampling_name">Textur-Sampling</string>
     <string name="texture_sampling_description">Setzt den von Spielen verwendeten Sampling-Filter außer Kraft. Dies kann in bestimmten Fällen nützlich sein, wenn sich die Spiele beim Hochskalieren schlecht verhalten. Wenn du dir unsicher bist, setze diese Einstellung auf „Spielgesteuert“</string>
     <string name="shaders_accurate_mul">Genaue Multiplikation</string>
@@ -302,11 +295,6 @@
     <string name="delay_start_lle_modules_description">Verzögert den Start der App, wenn die LLE-Module aktiviert sind.</string>
     <string name="deterministic_async_operations">Deterministische asynchrone Operationen</string>
     <string name="deterministic_async_operations_description">Asynchrone Operationen werden für Debug-Zwecke deterministisch. Die Aktivierung dieser Funktion kann zum Einfrieren führen.</string>
-    <string name="enable_rpc_server">RPC Server aktivieren</string>
-    <string name="enable_rpc_server_desc">Aktiviert den RPC Server auf Port 45987. Dadurch können Programme im emulierten RAM lesen und schreiben.</string>
-    <string name="shader_jit">Shader JIT aktivieren</string>
-    <string name="shader_jit_description">Verwendet die JIT Engine anstatt des Interpreters für Software Shader Emulation.</string>
-
     <!-- Layout settings strings -->
     <string name="layout_screen_orientation">Bildschirmausrichtung</string>
     <string name="layout_screen_orientation_auto_sensor">Automatisch</string>
@@ -314,13 +302,6 @@
     <string name="layout_screen_orientation_landscape_reverse">Umgekehrtes Querformat</string>
     <string name="layout_screen_orientation_portrait">Hochformat</string>
     <string name="layout_screen_orientation_portrait_reverse">Umgekehrtes Hochformat</string>
-    <string name="aspect_ratio_default">Standard</string>
-    <string name="aspect_ratio_16_9">16:9</string>
-    <string name="aspect_ratio_4_3">4:3</string>
-    <string name="aspect_ratio_21_9_fullscreen">21:9</string>
-    <string name="aspect_ratio_16_10_fullscreen_stretched">16:10</string>
-    <string name="aspect_ratio_stretch">Gestreckt</string>
-
     <!-- Miscellaneous -->
     <string name="clear">Zurücksetzen</string>
     <string name="slider_default">Standard</string>
@@ -356,9 +337,6 @@
     <string name="cancelling">Wird abgebrochen...</string>
     <string name="important">Wichtig</string>
     <string name="dont_show_again">Nicht noch einmal anzeigen</string>
-    <string name="visibility">Sichtbarkeit</string>
-    <string name="information">Information</string>
-
     <!-- Add Directory Screen-->
     <string name="select_game_folder">Spieleordner auswählen</string>
 
@@ -405,7 +383,6 @@
     <string name="emulation_control_dpad_slide_enable">Steuerkreuz-Gleiten</string>
     <string name="emulation_open_settings">Einstellungen öffnen</string>
     <string name="emulation_open_cheats">Cheats öffnen</string>
-    <string name="emulation_aspect_ratio">Seitenverhältnis</string>
     <string name="emulation_switch_screen_layout">Querformat-Bildschirmanordnung</string>
     <string name="emulation_switch_portrait_layout">Hochformat-Bildschirmanordnung</string>
     <string name="emulation_screen_layout_largescreen">Großer Bildschirm</string>
@@ -441,9 +418,7 @@
     <string name="emulation_custom_layout_height">Höhe</string>
     <string name="emulation_cycle_landscape_layouts">Anordnung wechseln</string>
     <string name="emulation_swap_screens">Bildschirme tauschen</string>
-    <string name="emulation_rotate_upright">Bildschirm aufrecht rotieren</string>
     <string name="emulation_touch_overlay_reset">Overlay zurücksetzen</string>
-    <string name="emulation_show_controller_overlay">Controller Overlay anzeigen</string>
     <string name="emulation_close_game">Spiel schließen</string>
     <string name="emulation_toggle_pause">Pause umschalten</string>
     <string name="miscellaneous">Weiteres</string>
@@ -510,6 +485,7 @@
     <string name="save_load_error">Fehler beim Speichern/Laden</string>
     <string name="fatal_error">Schwerwiegender Fehler</string>
     <string name="fatal_error_message">Es ist ein schwerwiegender Fehler aufgetreten. Weitere Informationen findest du in der Protokolldatei.\nDas Fortfahren könnte zu ungewollten Abstürzen oder Problemen führen.</string>
+    <string name="invalid_region">Ungültige Region</string>
     <string name="unsupported_encrypted">Nicht unterstützte verschlüsselte Anwendung</string>
 
     <!-- Disk Shader Cache -->
@@ -530,39 +506,6 @@
     <string name="game_context_uninstall_dlc">DLC deinstallieren</string>
     <string name="game_context_uninstall_updates">Updates deinstallieren</string>
     <string name="shortcut">Verknüpfung</string>
-    <string name="shortcut_name">Verknüpfungsname</string>
-    <string name="edit_icon">Symbol bearbeiten</string>
-    <string name="create_shortcut">Verknüpfung erstellen</string>
-    <string name="shortcut_name_empty">Verknüpfungsname darf nicht leer sein</string>
-    <string name="shortcut_image_stretch_toggle">Bildgröße anpassen</string>
-    <!-- Performance Overlay settings -->
-    <string name="performance_overlay_show">Leistungs-Overlay anzeigen</string>
-    <string name="performance_overlay_options">Leistungs-Overlay</string>
-    <string name="performance_overlay_enable">Leistungsoverlay aktivieren</string>
-    <string name="performance_overlay_options_description">Konfigurieren Sie, ob das Leistungs-Overlay angezeigt wird und welche Informationen angezeigt werden.</string>
-    <string name="overlay_show_fps">FPS anzeigen</string>
-    <string name="overlay_show_fps_description">Aktuelle Bilder pro Sekunde anzeigen.</string>
-    <string name="overlay_show_frametime">Frametime anzeigen</string>
-    <string name="overlay_show_frametime_description">Aktuelle Frametime anzeigen.</string>
-    <string name="overlay_show_speed">Geschwindigkeit anzeigen</string>
-    <string name="overlay_show_speed_description">Zeigt die aktuelle Emulationsgeschwindigkeit in Prozent an.</string>
-    <string name="overlay_show_app_ram_usage">App-Speichernutzung anzeigen</string>
-    <string name="overlay_show_app_ram_usage_description">Zeigt die vom Emulator verwendete RAM-Menge an.</string>
-    <string name="overlay_show_available_ram">Verfügbaren Speicher anzeigen</string>
-    <string name="overlay_show_available_ram_description">Zeigt die verfügbare RAM-Menge an.</string>
-    <string name="overlay_show_battery_temp">Batterietemperatur anzeigen</string>
-    <string name="overlay_show_battery_temp_description">Zeigt die aktuelle Batterietemperatur in Celsius und Fahrenheit an.</string>
-    <string name="overlay_position">Overlay-Position</string>
-    <string name="overlay_position_description">Wählen Sie, wo das Leistungs-Overlay auf dem Bildschirm angezeigt wird</string>
-    <string name="overlay_position_top_left">Links Oben</string>
-    <string name="overlay_position_top_right">Rechts Oben</string>
-    <string name="overlay_position_bottom_left">Links Unten</string>
-    <string name="overlay_position_bottom_right">Rechts Unten</string>
-    <string name="overlay_position_center_top">Oben Mittig</string>
-    <string name="overlay_position_center_bottom">Unten Mittig</string>
-    <string name="overlay_background">Overlay Hintergrund</string>
-    <string name="overlay_background_description">Fügt einen Hintergrund hinter dem Overlay hinzu für bessere Lesbarkeit.</string>
-
     <!-- Cheats -->
     <string name="cheats">Cheats</string>
     <string name="cheats_add">Cheat hinzufügen</string>

src/android/app/src/main/res/values-fr/strings.xml

@@ -193,9 +193,6 @@
     <string name="region_mismatch">Avertissement d\'incompatibilité de région</string>
     <string name="region_mismatch_emulated">Le paramètre de pays n\'est pas valide pour la région émulée sélectionnée.</string>
     <string name="region_mismatch_console">Le paramètre de pays n\'est pas valide pour la console actuellement connectée.</string>
-    <string name="storage">Stockage</string>
-    <string name="compress_cia_installs">Compresser le contenu CIA installé</string>
-    <string name="compress_cia_installs_description">Compresse le contenu des fichiers CIA lorsqu\'ils sont installés sur la carte SD émulée. N\'affecte que le contenu CIA installé lorsque le paramètre est activé.</string>
 
     <!-- Camera settings strings -->
     <string name="inner_camera">Caméra intérieure</string>
@@ -400,10 +397,6 @@
     <string name="emulation_configure_controls">Configurer les commandes</string>
     <string name="emulation_edit_layout">Modifier la disposition</string>
     <string name="emulation_done">Terminé</string>
-    <string name="emulation_button_sliding">Bouton coulissant</string>
-    <string name="emulation_button_sliding_disabled">Maintenez le bouton initialement enfoncé</string>
-    <string name="emulation_button_sliding_enabled">Maintenez le bouton enfoncé</string>
-    <string name="emulation_button_sliding_alternative">Maintenez enfoncé le bouton d\'origine et celui qui est actuellement enfoncé</string>
     <string name="emulation_toggle_controls">Alterner les commandes</string>
     <string name="emulation_control_scale">Ajuster la taille</string>
     <string name="emulation_control_scale_global">Taille globale</string>
@@ -518,6 +511,7 @@
     <string name="save_load_error">Erreur de sauvegarde/chargement</string>
     <string name="fatal_error">Erreur fatale</string>
     <string name="fatal_error_message">Une erreur fatale s\'est produite. Veuillez consulter les logs pour plus de détails.\nPoursuivre l\'émulation peut entraîner des plantages et des bugs.</string>
+    <string name="invalid_region">Région invalide</string>
     <string name="unsupported_encrypted">Application encryptée non supportée</string>
 
     <!-- Disk Shader Cache -->
@@ -543,9 +537,6 @@
     <string name="create_shortcut">Créer un raccourci</string>
     <string name="shortcut_name_empty">Le nom du raccourci ne peut pas être vide</string>
     <string name="shortcut_image_stretch_toggle">Étirer pour ajuster l\'image</string>
-    <string name="game_context_id">ID :</string>
-    <string name="game_context_file">Fichier :</string>
-    <string name="game_context_type">Type :</string>
 
     <!-- Performance Overlay settings -->
     <string name="performance_overlay_show">Afficher l\'overlay des performances</string>

src/android/app/src/main/res/values-it/strings.xml

@@ -18,7 +18,7 @@ Cos\'è questo:
     <string name="install_game_content">Installa file CIA</string>
     <string name="install_game_content_description">Installa applicazioni, aggiornamenti o DLC</string>
     <string name="share_log">Condividi Log</string>
-    <string name="share_log_description">Condividi il file di log di Azahar per il debug di problemi</string>
+    <string name="share_log_description">Condividi il file di log di Azahar per il debug</string>
     <string name="gpu_driver_manager">Gestione driver GPU</string>
     <string name="install_gpu_driver">Installa driver GPU</string>
     <string name="install_gpu_driver_description">Installa driver alternativi per possibili miglioramenti nelle performance o nell\'accuratezza</string>
@@ -80,21 +80,13 @@ Divertiti usando l\'emulatore!</string>
     <string name="add_games_warning">Saltare la selezione della cartella applicazioni?</string>
     <string name="add_games_warning_description">Non verrà mostrato alcun software nella lista applicazioni se non viene selezionata alcuna cartella.</string>
     <string name="permissions">Permessi</string>
-    <string name="select_emulator_data_folders">Cartella dati</string>
-    <string name="select_emulator_data_folders_description"><![CDATA[Seleziona la cartella dati<br/>(La cartella utente è richiesta)]]></string>
-    <string name="permissions_description">Concedere autorizzazioni opzionali per utilizzare specifiche funzionalità dell\'emulatore</string>
     <string name="warning_help">Aiuto</string>
     <string name="warning_skip">Salta</string>
     <string name="warning_cancel">Indietro</string>
     <string name="select_citra_user_folder">Seleziona cartella utente</string>
     <string name="select_citra_user_folder_description"><![CDATA[Seleziona la tua cartella <a href=\"https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage\">utente</a> usando il bottone sottostante.]]></string>
-    <string name="select_which_user_directory_to_use">Sembra che tu abbia impostato la cartella utente sia per Lime3DS che per Azahar. Questo probabilmente è dovuto al fatto che hai eseguito l\'aggiornamento ad Azahar e, al momento della richiesta, hai scelto una directory utente diversa da quella utilizzata per Lime3DS.\n\nQuesto potrebbe averti fatto pensare di aver perso salvataggi o altre impostazioni - ci scusiamo se è successo.\n\nDesideri tornare a utilizzare la tua cartella utente originale di Lime3DS, ripristinando impostazioni e salvataggi da Lime3DS, oppure preferisci mantenere la cartella utente attuale di Azahar?\n\nNessuna delle cartelle verrà eliminata, indipendentemente dalla tua scelta, e potrai passare liberamente da una all\'altra utilizzando l\'opzione \"Seleziona Cartella Utente\".</string>
-    <string name="keep_current_azahar_directory">Mantieni la cartella di Azahar attuale</string>
-    <string name="use_prior_lime3ds_directory">Usa la cartella precedente di Lime3DS</string>
     <string name="select">Seleziona</string>
-    <string name="cannot_skip">Non puoi saltare la configurazione della cartella utente</string>
     <string name="cannot_skip_directory_description">Questo passaggio è richiesto per permettere che Azahar funzioni. Quando la cartella verrà selezionata potrai continuare.</string>
-    <string name="selecting_user_directory_without_write_permissions">Hai perso i permessi di scrittura sulla tua <a href="https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage">cartella dei dati utente</a>, dove sono memorizzati i salvataggi e altre informazioni. Questo può accadere dopo alcuni aggiornamenti app o Android. Ri-seleziona la cartella per recuperare le autorizzazioni in modo da poter continuare.</string>
     <string name="set_up_theme_settings">Impostazioni tema</string>
     <string name="setup_theme_settings_description">Configura le impostazioni del tema di Azahar.</string>
     <string name="setup_set_theme">Imposta tema</string>
@@ -131,21 +123,13 @@ Divertiti usando l\'emulatore!</string>
     <string name="input_binding_description_horizontal_axis">Muovi il joystick a sinistra o a destra.</string>
     <string name="button_home">Home</string>
     <string name="button_swap">Inverti Schermi</string>
-    <string name="button_turbo">Turbo</string>
     <string name="input_message_analog_only">Questo controllo dev\'essere assegnato ad uno stick analogico di un gamepad o ad un asse del Pad Direzionale!</string>
     <string name="input_message_button_only">Questo controllo dev\'essere assegnato a un pulsante del gamepad!</string>
-    <string name="turbo_limit_hotkey">Turbo speed</string>
-    <string name="turbo_enabled_toast">\"Turbo speed\" abilitato</string>
-    <string name="turbo_disabled_toast">\"Turbo speed\" disabilitato</string>
-
     <!-- System files strings -->
     <string name="setup_system_files">File di Sistema</string>
     <string name="setup_system_files_description">Esegui operazioni sui file di sistema come installare file di sistema o avviare il Menu Home</string>
     <string name="setup_tool_connect">Connettiti a Artic Setup Tool </string>
-    <string name="setup_system_files_preamble"><![CDATA[Azahar necessita di dati unici della console e file firmware provenienti da una console reale per poter utilizzare alcune delle sue funzionalità. Questi file e dati possono essere configurati con <a href=https://github.com/azahar-emu/ArticSetupTool>Azahar Artic Setup Tool</a>.<br>Note: <ul><li><b>Questa operazione installerà dati unici della console su Azahar, non condividere le tue cartelle utente o NAND dopo aver completato il processo di configurazione!</b></li><li>Durante il processo di configurazione, Azahar si collegherà alla console che sta eseguendo lo strumento di configurazione. Puoi scollegare la console in seguito dalla scheda \"File di sistema\" nel menu delle opzioni dell\'emulatore.</li><li>Non andare online contemporaneamente con Azahar e la tua console 3DS dopo aver configurato i file di sistema, poiché ciò potrebbe causare problemi.</li><li>La configurazione del vecchio 3DS è necessaria affinché la configurazione del nuovo 3DS funzioni (si consiglia di configurare entrambi).</li><li>Entrambe le modalità di configurazione funzioneranno indipendentemente dal modello della console che esegue lo strumento di configurazione.</li></ul>]]></string>
+    <string name="setup_system_files_detect">Ottenendo lo stato attuale dei file di sistema, per favore attendi...</string>
-    <string name="setup_system_files_detect">Recupero dello stato attuale dei file di sistema, per favore attendi...</string>
-    <string name="delete_system_files">Scollega i dati univoci della console</string>
-    <string name="delete_system_files_description"><![CDATA[Questa azione scollegherà la tua console reale da Azahar, con le seguenti conseguenze:<br><ul><li>il tuo OTP, SecureInfo e LocalFriendCodeSeed verranno rimossi da Azahar.</li><li>La tua lista amici verrà reimpostata e verrai disconnesso dal tuo account NNID/PNID.</li><li>I file di sistema e i titoli eshop ottenuti tramite Azahar diventeranno inaccessibili finché la stessa console non verrà nuovamente collegata tramite lo strumento di configurazione (i dati di salvataggio non andranno persi).</li></ul><br>Continuare?]]></string>
     <string name="setup_system_files_o3ds">Setup Old 3DS</string>
     <string name="setup_system_files_n3ds">Setup New 3DS</string>
     <string name="setup_system_files_possible">Il setup è possibile.</string>
@@ -174,7 +158,6 @@ Divertiti usando l\'emulatore!</string>
     <string name="init_clock_description">Scegli se l\'orologio di sistema del 3DS emulato dovrà rispecchiare l\'orario del tuo dispositivo o se dovrà indicare una data e ora in particolare.</string>
     <string name="device_clock">Orologio del dispositivo</string>
     <string name="simulated_clock">Orologio simulato</string>
-    <string name="simulated_clock_description">Se l\'orologio è impostato su \"Orologio simulato\", questo cambia la data e l\'ora di inizio.</string>
     <string name="profile_settings">Impostazioni profilo</string>
     <string name="emulated_region">Regione</string>
     <string name="emulated_language">Lingua</string>
@@ -195,13 +178,6 @@ Divertiti usando l\'emulatore!</string>
     <string name="plugin_loader_description">Carica i plugin 3GX dalla scheda SD emulata, se disponibili.</string>
     <string name="allow_plugin_loader">Consenti alle applicazioni di cambiare lo stato del Plugin Loader</string>
     <string name="allow_plugin_loader_description">Permetti alle app homebrew di abilitare il Plugin Loader anche quando è disabilitato.</string>
-    <string name="region_mismatch">Mancata corrispondenza della regione</string>
-    <string name="region_mismatch_emulated">L\'impostazione del paese non è valida per la regione emulata selezionata.</string>
-    <string name="region_mismatch_console">L\'impostazione del paese non è valida per la console attualmente collegata.</string>
-    <string name="storage">Archiviazione</string>
-    <string name="compress_cia_installs">Comprimi i contenuti CIA installati</string>
-    <string name="compress_cia_installs_description">Comprime il contenuto dei file CIA quando installati sulla scheda SD emulata. Riguarda solo i contenuti CIA installati mentre l\'impostazione è abilitata.</string>
-
     <!-- Camera settings strings -->
     <string name="inner_camera">Fotocamera Interna</string>
     <string name="outer_left_camera">Fotocamera Esterna di Sinistra</string>
@@ -220,34 +196,23 @@ Divertiti usando l\'emulatore!</string>
     <string name="graphics_api">API grafiche</string>
     <string name="spirv_shader_gen">Abilita la generazione di shader SPIR-V</string>
     <string name="spirv_shader_gen_description">Crea le fragments shader usate per emulare PICA tramite SPIR-V, invece di GLSL</string>
-    <string name="disable_spirv_optimizer">Disabilita SPIR-V Optimizer</string>
-    <string name="disable_spirv_optimizer_description">Disabilita il passaggio di ottimizzazione SPIR-V, riducendo considerevolmente gli stutter e influendo appena sulle prestazioni.</string>
     <string name="async_shaders">Abilita la compilazione asincrona delle shader</string>
-    <string name="async_shaders_description">Compila le shader in background per ridurre lo stuttering durante il gioco. Quando abilitato, potrebbero verificarsi dei glitch grafici.</string>
+    <string name="async_shaders_description">Compila le shader in background per ridurre lo stuttering durante il gameplay. Quando abilitato, potrebbero verificarsi dei glitch grafici.</string>
     <string name="linear_filtering">Filtering Lineare</string>
-    <string name="linear_filtering_description">Abilita il filtraggio lineare, che fa sembrare più smussata la grafica dei giochi.</string>
+    <string name="linear_filtering_description">Abilita il filtro lineare, che fa sembrare più smussata la grafica dei giochi.</string>
     <string name="texture_filter_name">Filtro Texture</string>
     <string name="texture_filter_description">Migliora la grafica delle applicazioni applicando un filtro alle texture. I filtri supportati sono Anime4k Ultrafast, Bicubic, ScaleForce, xBRZ freescale e MMPX.</string>
     <string name="delay_render_thread">Ritarda il thread di rendering del gioco</string>
     <string name="delay_render_thread_description">Ritarda il thread di rendering del gioco quando invia dati alla GPU. Aiuta con i problemi di prestazioni nelle (poche) applicazioni con frame rate dinamici.</string>
-    <string name="advanced">Avanzato</string>
-    <string name="texture_sampling_name">Campionamento texture</string>
-    <string name="texture_sampling_description">Sovrascrive il filtro di campionamento utilizzato dai giochi. Questo può essere utile in alcuni casi con giochi che gestiscono male l\'upscaling. Se hai dubbi, imposta questa opzione su \"Gestito dal gioco\".</string>
     <string name="shaders_accurate_mul">Moltiplicazione Accurata</string>
     <string name="shaders_accurate_mul_description">Utilizza una moltiplicazione più accurata degli shader hardware, che potrebbe correggere alcuni bug grafici. Se abilitato, le prestazioni saranno ridotte.</string>
-    <string name="asynchronous_gpu">Abilita l\'emulazione GPU asincrona</string>
+    <string name="asynchronous_gpu">Abilita emulazione GPU asincrona</string>
-    <string name="asynchronous_gpu_description">Usa un thread separato per l\'emulazione asincrona della GPU. Quando è abilitato le prestazioni saranno migliori.</string>
+    <string name="asynchronous_gpu_description">Utilizza un thread separato per emulare la GPU in differita. Se abilitato, le prestazioni miglioreranno.</string>
     <string name="frame_limit_enable">Limita Velocità</string>
-    <string name="frame_limit_enable_description">Quando abilitata, la velocità di emulazione sarà limitata a una percentuale specificata della velocità normale. Se disabilitato, la velocità di emulazione non sarà limitata e tasto di scelta rapida per \"Turbo speed\" non funzionerà.</string>
     <string name="frame_limit_slider">Limita Velocità tramite Percentuale</string>
     <string name="frame_limit_slider_description">Specifica a quale percentuale limitare la velocità d\'emulazione. Utilizzando l\'impostazione predefinita di 100% l\'emulazione sarà limitata alla velocità normale. Valori superiori o inferiori aumenteranno o diminuiranno il limite di velocità.</string>
-    <string name="turbo_limit">Limite \"Turbo speed\"</string>
-    <string name="turbo_limit_description">Limite di velocità dell\'emulazione usato quando il tasto di scelta rapida del turbo è attivo.</string>
-    <string name="expand_to_cutout_area">Espandi all\'area di ritaglio</string>
-    <string name="expand_to_cutout_area_description">Espande l\'area di visualizzazione per includere l\'area di ritaglio (o notch).</string>
     <string name="internal_resolution">Risoluzione Interna</string>
-    <string name="internal_resolution_description">Specifica la risoluzione a cui renderizzare. Una risoluzione alta migliorerà la qualità visiva ma avrà un grande effetto sulle prestazioni e potrebbe causare glitch in alcune applicazioni.</string>
+    <string name="internal_resolution_description">Specifica la risoluzione a cui renderizzare. Una risoluzioe alta migliorerà la qualità visiva ma avrà un grande effetto sulle performance e potrebbe causare glitch in alcune applicazioni.</string>
-    <string name="internal_resolution_setting_auto">Auto (dimensione dello schermo)</string>
     <string name="internal_resolution_setting_1x">Nativa (400x240)</string>
     <string name="internal_resolution_setting_2x">2x Nativa (800x480)</string>
     <string name="internal_resolution_setting_3x">3x Nativa (1200x720)</string>
@@ -258,21 +223,20 @@ Divertiti usando l\'emulatore!</string>
     <string name="internal_resolution_setting_8x">8x Nativa (3200x1920)</string>
     <string name="internal_resolution_setting_9x">9x Nativa (3600x2160)</string>
     <string name="internal_resolution_setting_10x">10x Nativa (4000x2400)</string>
-    <string name="performance_warning">Disabilitare questa impostazione riducerà significativamente le prestazioni dell\'emulazione! Per un\'esperienza migliore, è consigliato lasciare questa impostazione abilitata.</string>
+    <string name="performance_warning">Disabilitare questa impostazione riducerà significativamente le performance dell\'emulazione! Per un\'esperienza migliore, è consigliato lasciare questa impostazione abilitata.</string>
     <string name="debug_warning">Attenzione: Modificare queste impostazioni rallenterà l\'emulazione</string>
     <string name="stereoscopy">Stereoscopia</string>
     <string name="render3d">Modalità Stereoscopia 3D</string>
     <string name="factor3d">Profondità</string>
-    <string name="factor3d_description">Specifica il valore del regolatore di profindità 3D. Questo valore deve essere impostato su un valore superiore allo 0% quando è abilitato il \"3D stereoscopico\".\nNote: Valori di profondità superiori al 100% non sono possibili su hardware reale e possono causare problemi grafici</string>
     <string name="disable_right_eye_render">Disabilita il rendering dell\'occhio destro</string>
     <string name="disable_right_eye_render_description">Migliora notevolmente le prestazioni in alcune applicazioni, ma può causare flickering in altre.</string>
     <string name="cardboard_vr">Cardboard VR</string>
     <string name="cardboard_screen_size">Grandezza Cardboard</string>
     <string name="cardboard_screen_size_description">Scala lo schermo ad una percentuale fissata della sua grandezza originale</string>
     <string name="cardboard_x_shift">Spostamento in Orizzontale</string>
-    <string name="cardboard_x_shift_description">Specifica la percentuale di spazio vuoto per spostare gli schermi orizzontalmente. Valori positivi muoveranno i due schermi al centro dello schermo, mentre i negativi faranno il contrario.</string>
+    <string name="cardboard_x_shift_description">Specifica la percentuale dello schermo che contiene uno spazio vuoto per shiftare lo schermo orizzontalmente. Valori positivi muoveranno i due occhi al centro dello schermo, mentre i negativi faranno il contrario</string>
     <string name="cardboard_y_shift">Spostamento Verticale</string>
-    <string name="cardboard_y_shift_description">Specifica la percentuale di spazio vuoto per spostare gli schermi verticalmente. Valori positivi muoveranno alla parte bassa dello schermo, mentre i negativi faranno il contrario.</string>
+    <string name="cardboard_y_shift_description">Specifica la percentuale dello schermo che contiene uno spazio vuoto per spostare lo schermo in verticale. Valori positivi muoveranno alla parte bassa dello schermo, mentre i negativi faranno il contrario.</string>
     <string name="use_shader_jit">Shader JIT</string>
     <string name="use_disk_shader_cache">Shader Cache su Disco</string>
     <string name="use_disk_shader_cache_description">Riduce lo stuttering salvando e caricando le shader generate sul disco principale. Non può essere usato senza aver prima attivato \"Abilita Shader Hardware\"</string>
@@ -282,9 +246,9 @@ Divertiti usando l\'emulatore!</string>
     <string name="custom_textures">Textures Personalizzate</string>
     <string name="custom_textures_description">Le texture vengono caricate da load/textures/[ID Gioco]/.</string>
     <string name="preload_textures">Precaricamento delle Textures Personalizzate</string>
-    <string name="preload_textures_description">Carica tutte le texture personalizzate nella RAM del dispositivo. Questa funzionalità può usare molta memoria.</string>
+    <string name="preload_textures_description">Carica tutte le texture personalizzate nella memoria RAM del dispositivo. Potrebbe comportare un uso eccessivamente alto della memoria.</string>
-    <string name="async_custom_loading">Caricamento asincrono delle Textures</string>
+    <string name="async_custom_loading">Caricamento delle Textures Asincrono</string>
-    <string name="async_custom_loading_description">Carica le texture personalizzate in modo asincrono con i thread in background per ridurre lo stutter del caricamento.</string>
+    <string name="async_custom_loading_description">Carica le texture personalizzate in modo asincrono e in background. Riduce lo stutter.</string>
 
     <!-- Audio settings strings -->
     <string name="audio_volume">Volume</string>
@@ -304,18 +268,13 @@ Divertiti usando l\'emulatore!</string>
     <string name="vsync">Abilita V-Sync</string>
     <string name="vsync_description">Sincronizza il frame rate dei giochi con il refresh rate del tuo dispositivo.</string>
     <string name="renderer_debug">Renderer di Debug</string>
-    <string name="renderer_debug_description">Registra ulteriori informazioni di debug relative alla grafica. Quando abilitata, le prestazioni del gioco saranno significativamente ridotte.</string>
+    <string name="renderer_debug_description">Logga informazioni di debug riguardante la grafica. Se abilitato, le performance del software emulato diminuiranno drasticamente</string>
     <string name="instant_debug_log">Svuota l\'output del log ad ogni messaggio</string>
     <string name="instant_debug_log_description">Invia immediatamente il log di debug al file. Usalo se Azahar si blocca e l\'output del log viene tagliato.</string>
     <string name="delay_start_lle_modules">Ritarda l\'avvio con moduli LLE</string>
     <string name="delay_start_lle_modules_description">Ritarda l\'avvio dell\'app quando i moduli LLE sono abilitati.</string>
     <string name="deterministic_async_operations">Operazioni Deterministiche desincronizzate</string>
     <string name="deterministic_async_operations_description">Rende le operazioni asincrone deterministiche per il debug. Abilitare questa opzione potrebbe causare blocchi.</string>
-    <string name="enable_rpc_server">Abilita server RPC</string>
-    <string name="enable_rpc_server_desc">Abilita il server RPC sulla porta 45987. Questo permette di leggere e scrivere remotamente la memoria guest.</string>
-    <string name="shader_jit">Abilita shader JIT</string>
-    <string name="shader_jit_description">Usa il motore JIT invece dell\'interprete per l\'emulazione di shader software.</string>
-
     <!-- Layout settings strings -->
     <string name="layout_screen_orientation">Orientamento schermo</string>
     <string name="layout_screen_orientation_auto_sensor">Automatico</string>
@@ -323,20 +282,12 @@ Divertiti usando l\'emulatore!</string>
     <string name="layout_screen_orientation_landscape_reverse">Orizzontale rovesciato</string>
     <string name="layout_screen_orientation_portrait">Verticale</string>
     <string name="layout_screen_orientation_portrait_reverse">Verticale rovesciato</string>
-    <string name="aspect_ratio_default">Default</string>
-    <string name="aspect_ratio_16_9">16:9</string>
-    <string name="aspect_ratio_4_3">4:3</string>
-    <string name="aspect_ratio_21_9_fullscreen">21:9</string>
-    <string name="aspect_ratio_16_10_fullscreen_stretched">16:10</string>
-    <string name="aspect_ratio_stretch">Allunga</string>
-
     <!-- Miscellaneous -->
     <string name="clear">Ripristina</string>
     <string name="slider_default">Standard</string>
     <string name="ini_saved">Impostazioni salvate</string>
     <string name="gameid_saved">Impostazioni salvate per %1$s</string>
     <string name="error_saving">Errore di salvataggio %1$s.ini: %2$s</string>
-    <string name="saving">Salvataggio...</string>
     <string name="loading">Caricamento...</string>
     <string name="next">Prossimo</string>
     <string name="back">Indietro</string>
@@ -357,23 +308,18 @@ Divertiti usando l\'emulatore!</string>
     <string name="select_rtc_time">Seleziona orario RTC</string>
     <string name="reset_setting_confirmation">Vuoi reimpostare questa impostazione al suo valore standard?</string>
     <string name="setting_not_editable">Non puoi modificare questo ora</string>
-    <string name="setting_disabled">Impostazione disabilitata</string>
-    <string name="setting_disabled_description">Questa impostazione è attualmente disattivata a causa di un\'altra impostazione che non è il valore appropriato.</string>
     <string name="setting_not_editable_description">Questa opzione non può essere modificata mentre un gioco è in esecuzione.</string>
     <string name="auto_select">Auto-seleziona.</string>
     <string name="start">Avvia</string>
     <string name="cancelling">Cancellazione...</string>
     <string name="important">Importante</string>
     <string name="dont_show_again">Non mostrare più</string>
-    <string name="visibility">Visibilità</string>
-    <string name="information">Informazione</string>
-
     <!-- Add Directory Screen-->
     <string name="select_game_folder">Seleziona cartella dei giochi</string>
 
     <!-- Game Properties -->
-    <string name="properties">Proprietà</string>
+    <string name="properties">Propietà</string>
-    <string name="properties_not_loaded">Impossibile caricare le proprietà del gioco.</string>
+    <string name="properties_not_loaded">Impossibile caricare le proprietà di questo gioco.</string>
 
     <!-- Preferences Screen -->
     <string name="preferences_settings">Impostazioni</string>
@@ -388,7 +334,7 @@ Divertiti usando l\'emulatore!</string>
     <string name="preferences_layout">Layout</string>
 
     <!-- ROM loading errors -->
-    <string name="loader_error_encrypted">La tua ROM è Criptata</string>
+    <string name="loader_error_encrypted">La tua ROM è Criptata!</string>
     <string name="loader_error_invalid_format">Formato ROM non valido</string>
     <string name="loader_error_file_not_found">Il file ROM non esiste</string>
     <string name="no_game_present">Nessun gioco avviabile è presente!</string>
@@ -405,10 +351,6 @@ Divertiti usando l\'emulatore!</string>
     <string name="emulation_configure_controls">Configura Controlli</string>
     <string name="emulation_edit_layout">Modifica Disposizione</string>
     <string name="emulation_done">Fatto</string>
-    <string name="emulation_button_sliding">Pulsante scorrevole</string>
-    <string name="emulation_button_sliding_disabled">Tieni premuto il pulsante originariamente premuto</string>
-    <string name="emulation_button_sliding_enabled">Tieni premuto il pulsante attualmente premuto</string>
-    <string name="emulation_button_sliding_alternative">Tieni premuto il pulsante originale e quello attualmente premuto</string>
     <string name="emulation_toggle_controls">Attiva Controlli</string>
     <string name="emulation_control_scale">Regola la Dimensione</string>
     <string name="emulation_control_scale_global">Scala Globale</string>
@@ -418,11 +360,8 @@ Divertiti usando l\'emulatore!</string>
     <string name="emulation_control_dpad_slide_enable">Trascinamento del D-Pad</string>
     <string name="emulation_open_settings">Apri Impostazioni</string>
     <string name="emulation_open_cheats">Apri Trucchi</string>
-    <string name="emulation_aspect_ratio">Proporzione</string>
     <string name="emulation_switch_screen_layout">Layout Schermi Orizzontale</string>
     <string name="emulation_switch_portrait_layout">Layout Schermi Verticale</string>
-    <string name="emulation_switch_secondary_layout">Layout dello schermo di visualizzazione secondario</string>
-    <string name="emulation_switch_secondary_layout_description">Il layout utilizzato da uno schermo secondario connesso, cablato o wireless (Chromecast, Miracast)</string>
     <string name="emulation_screen_layout_largescreen">Schermo Grande</string>
     <string name="emulation_screen_layout_portrait">Verticale</string>
     <string name="emulation_screen_layout_single">Schermo singolo</string>
@@ -430,20 +369,17 @@ Divertiti usando l\'emulatore!</string>
     <string name="emulation_screen_layout_hybrid">Schermi Ibridi</string>
     <string name="emulation_screen_layout_original">Originale</string>
     <string name="emulation_portrait_layout_top_full">Standard</string>
-    <string name="emulation_secondary_display_default">Predefinito del sistema (specchio)</string>
     <string name="emulation_screen_layout_custom">Layout personalizzato</string>
     <string name="emulation_small_screen_position">Posizione schermo piccolo</string>
     <string name="small_screen_position_description">Dove dovrebbe apparire lo schermo inferiore rispetto a quello superiore nella modalità Schermo Grande?</string>
-    <string name="small_screen_position_top_right">In alto a destra</string>
+    <string name="small_screen_position_top_right">Alto-Destra</string>
     <string name="small_screen_position_middle_right">Centro-Destra</string>
     <string name="small_screen_position_bottom_right">Basso-Destra (Standard)</string>
-    <string name="small_screen_position_top_left">In alto a sinistra</string>
+    <string name="small_screen_position_top_left">Alto-Sinistra</string>
     <string name="small_screen_position_middle_left">Centro-Sinistra</string>
     <string name="small_screen_position_bottom_left">Basso-Sinistra</string>
     <string name="small_screen_position_above">Sopra</string>
     <string name="small_screen_position_below">Sotto</string>
-    <string name="screen_gap">Spazio tra gli schermi</string>
-    <string name="screen_gap_description">Spazio tra gli schermi in tutte le modalità a due schermi. Misurato in px rispetto all\'altezza di 240px dello schermo più grande.</string>
     <string name="large_screen_proportion">Proporzioni Schermo Superiore</string>
     <string name="large_screen_proportion_description">Quante volte più grande deve essere lo schermo superiore rispetto a quello inferiore nella modalità Schermo Grande?</string>
     <string name="emulation_adjust_custom_layout">Modifica Layout personalizzato nelle impostazioni</string>
@@ -457,9 +393,7 @@ Divertiti usando l\'emulatore!</string>
     <string name="emulation_custom_layout_height">Altezza</string>
     <string name="emulation_cycle_landscape_layouts">Rotazione Layout</string>
     <string name="emulation_swap_screens">Inverti Schermi</string>
-    <string name="emulation_rotate_upright">Ruota lo schermo in verticale</string>
     <string name="emulation_touch_overlay_reset">Ripristina Disposizione</string>
-    <string name="emulation_show_controller_overlay">Mostra Overlay Controller</string>
     <string name="emulation_close_game">Chiudi il Gioco</string>
     <string name="emulation_toggle_pause">Abilita/disabilita Pausa</string>
     <string name="miscellaneous">Miscellanea</string>
@@ -471,7 +405,7 @@ Divertiti usando l\'emulatore!</string>
     <string name="menu_emulation_amiibo_remove">Rimuovi</string>
     <string name="select_amiibo">Seleziona il file contenente il tuo Amiibo.</string>
     <string name="amiibo_load_error">Impossibile caricare l\'Amiibo</string>
-    <string name="amiibo_load_error_message">Durante il caricamento del file Amiibo specificato, si è verificato un errore. Controlla che il file sia corretto.</string>
+    <string name="amiibo_load_error_message">Durante il caricamento di un file Amiibo, si è verificato un errore. Controlla che il file sia corretto.</string>
     <string name="pause_emulation">Metti in pausa emulazione</string>
     <string name="resume_emulation">Riprendi emulazione</string>
     <string name="lock_drawer">Blocca cassetto</string>
@@ -499,8 +433,8 @@ Divertiti usando l\'emulatore!</string>
     <string name="i_forgot">L\'ho Dimenticato</string>
     <string name="fixed_length_required">La lunghezza del testo non è corretta (deve essere di %d caratteri)</string>
     <string name="max_length_exceeded">Il testo è troppo lungo (non deve essere più lungo di %d caratteri)</string>
-    <string name="blank_input_not_allowed">Non è permesso lasciare il campo vuoto</string>
+    <string name="blank_input_not_allowed">Non è consentito lasciarlo vuoto</string>
-    <string name="empty_input_not_allowed">Non è permesso lasciare il campo vuoto</string>
+    <string name="empty_input_not_allowed">Non è consentito lasciarlo vuoto</string>
     <string name="invalid_input">Input non valido</string>
 
     <!-- Mii Selector -->
@@ -521,11 +455,12 @@ Divertiti usando l\'emulatore!</string>
     <string name="continue_button">Continua</string>
     <string name="system_archive_not_found">Archivio di Sistema Non Trovato</string>
     <string name="system_archive_not_found_message">%s è mancante. Fai il dump del tuo archivio di sistema.\nProseguire con l\'emulazione potrebbe causare crash e bugs</string>
-    <string name="cia_file_not_found">Installazione Fallita. File CIA non trovato</string>
+    <string name="cia_file_not_found">Installazione Fallita. Impossibile trovare il file .CIA specificato.</string>
     <string name="system_archive_general">Archivio di Sistema</string>
     <string name="save_load_error">Errore nel Salvataggio/Caricamento</string>
     <string name="fatal_error">Errore Fatale</string>
-    <string name="fatal_error_message">Si è verificato un errore fatale. Controllare il log per i dettagli.\nContinuare l\'emulazione può causare crash e bug.</string>
+    <string name="fatal_error_message">Consulta il log per i dettagli.\nContinuare con l\'emulazione potrebbe causare un crash.</string>
+    <string name="invalid_region">Regione non valida</string>
     <string name="unsupported_encrypted">Applicazione criptata non supportata</string>
 
     <!-- Disk Shader Cache -->
@@ -534,55 +469,7 @@ Divertiti usando l\'emulatore!</string>
 
     <!-- About Game Dialog -->
     <string name="play">Riproduci</string>
-    <string name="uninstall_cia">Disinstalla applicazione</string>
-    <string name="uninstalling">Disinstallazione...</string>
-    <string name="game_context_open_save_dir">Apri cartella dei salvataggi</string>
-    <string name="game_context_open_app">Apri cartella applicazione</string>
-    <string name="game_context_open_mods">Apri cartella delle mod</string>
-    <string name="game_context_open_textures">Apri cartella delle texture</string>
-    <string name="game_context_open_dlc">Apri catella DLC</string>
-    <string name="game_context_open_updates">Apri cartella degli aggiornamenti</string>
-    <string name="game_context_open_extra">Apri cartella extra</string>
-    <string name="game_context_uninstall_dlc">Disinstalla DLC</string>
-    <string name="game_context_uninstall_updates">Disinstalla aggiornamenti</string>
     <string name="shortcut">Scorciatoia</string>
-    <string name="shortcut_name">Nome della scorciatoia</string>
-    <string name="edit_icon">Modifica icona</string>
-    <string name="create_shortcut">Crea scorciatoia</string>
-    <string name="shortcut_name_empty">Il nome della scorciatoia non può essere vuoto</string>
-    <string name="shortcut_image_stretch_toggle">Estendi per adattare l\'immagine</string>
-    <string name="game_context_id">ID:</string>
-    <string name="game_context_file">File:</string>
-    <string name="game_context_type">Tipo:</string>
-
-    <!-- Performance Overlay settings -->
-    <string name="performance_overlay_show">Mostra overlay prestazioni</string>
-    <string name="performance_overlay_options">Overlay delle prestazioni</string>
-    <string name="performance_overlay_enable">Abilita overlay prestazioni</string>
-    <string name="performance_overlay_options_description">Configura se l\'overlay delle prestazioni viene visualizzato e quali informazioni vengono visualizzate.</string>
-    <string name="overlay_show_fps">Mostra FPS</string>
-    <string name="overlay_show_fps_description">Mostra i fotogrammi al secondo attuali.</string>
-    <string name="overlay_show_frametime">Mostra il frametime</string>
-    <string name="overlay_show_frametime_description">Mostra il frametime attuale.</string>
-    <string name="overlay_show_speed">Mostra velocità</string>
-    <string name="overlay_show_speed_description">Mostra la percentuale di emulazione attuale.</string>
-    <string name="overlay_show_app_ram_usage">Mostra utilizzo della memoria dell\'app</string>
-    <string name="overlay_show_app_ram_usage_description">Mostra la quantità di RAM usata dall\'emulatore.</string>
-    <string name="overlay_show_available_ram">Mostra memoria disponibile</string>
-    <string name="overlay_show_available_ram_description">Mostra la quantità di RAM disponibile.</string>
-    <string name="overlay_show_battery_temp">Mostra temperatura batteria</string>
-    <string name="overlay_show_battery_temp_description">Mostra la temperatura attuale, in Celsius e Fahrenheit, della batteria.</string>
-    <string name="overlay_position">Posizione overlay</string>
-    <string name="overlay_position_description">Scegli dove visualizzare l\'overlay delle prestazioni sullo schermo.</string>
-    <string name="overlay_position_top_left">In alto a sinistra</string>
-    <string name="overlay_position_top_right">In alto a destra</string>
-    <string name="overlay_position_bottom_left">In basso a sinistra</string>
-    <string name="overlay_position_bottom_right">In basso a destra</string>
-    <string name="overlay_position_center_top">In alto al centro</string>
-    <string name="overlay_position_center_bottom">In basso al centro</string>
-    <string name="overlay_background">Sfondo dell\'overlay</string>
-    <string name="overlay_background_description">Aggiunge uno sfondo dietro all\'overlay per una lettura più facile.</string>
-
     <!-- Cheats -->
     <string name="cheats">Trucchi</string>
     <string name="cheats_add">Aggiungi Trucco</string>
@@ -600,13 +487,13 @@ Divertiti usando l\'emulatore!</string>
     <plurals name="cia_install_toast">
         <item quantity="one">Installando %d file. Guarda le notifiche per maggiori dettagli.</item>
         <item quantity="many">Installando %dfiles. Guarda le notifiche per maggiori dettagli.</item>
-        <item quantity="other">Installando i file di %d. Guarda le notifiche per maggiori dettagli.</item>
+        <item quantity="other">Installando %d files. Guarda le notifiche per maggiori dettagli.</item>
     </plurals>
     <string name="cia_install_notification_channel_description">Notifiche di Azahar durante l\'installazione dei CIA</string>
     <string name="cia_install_notification_title">Installando il CIA</string>
     <string name="cia_install_notification_installing">Installazione %1$s (%2$d/%3$d)</string>
     <string name="cia_install_notification_success_title">CIA installato con successo</string>
-    <string name="cia_install_notification_error_title">Errore nell\'installazione del file CIA</string>
+    <string name="cia_install_notification_error_title">Errore nell\'installazione del file CIA.</string>
     <string name="cia_install_success">\"%s\" è stato installato con successo</string>
     <string name="cia_install_error_aborted">L\'installazione di \"%s\" è stata annullata.\n Consulta i log per maggiori dettagli</string>
     <string name="cia_install_error_invalid">\"%s\" non è un CIA valido</string>
@@ -702,11 +589,7 @@ Divertiti usando l\'emulatore!</string>
     <string name="xbrz">xBRZ</string>
     <string name="mmpx">MMPX</string>
 
-    <!-- Texture Sampling names -->
-    <string name="game_controlled">Controllata dal gioco</string>
     <string name="nearest_neighbor">Nearest Neighbor</string>
-    <string name="linear">Lineare</string>
-
     <!-- Sound output modes -->
     <string name="mono">Mono</string>
     <string name="stereo">Stereo</string>
@@ -862,7 +745,7 @@ Divertiti usando l\'emulatore!</string>
     <string name="december">Dicembre</string>
 
     <!-- Artic base -->
-    <string name="artic_server_comm_error">Comunicazione con il server Artic Base fallita. L\'emulazione verrà interrotta</string>
+    <string name="artic_server_comm_error">Fallimento nella comunicazione con il server Artic Base. L\'emulazione verrà interrotta</string>
     <string name="artic_base">Artic Base</string>
     <string name="artic_base_connect_description">Connettiti a una console reale che sta eseguendo il server Artic Base</string>
     <string name="artic_base_connect">Connetti ad Artic Base</string>
@@ -873,6 +756,6 @@ Divertiti usando l\'emulatore!</string>
     <string name="emulation_quicksave">Salvataggio Rapido</string>
     <string name="emulation_quickload">Caricamento Rapido</string>
     <string name="emulation_occupied_quicksave_slot">Salvataggio Rapido - %1$tF %1$tR</string>
-    <string name="quickload_not_found">Nessun salvataggio rapido disponibile</string>
+    <string name="quickload_not_found">Nessun Salvataggio Rapido Disponibile</string>
 
 </resources>

src/android/app/src/main/res/values/arrays.xml

@@ -35,26 +35,12 @@
         <item>@string/emulation_screen_layout_custom</item>
     </string-array>
 
-    <string-array name="secondaryLayouts">
-        <item>@string/emulation_secondary_display_default</item>
-        <item>@string/emulation_top_screen</item>
-        <item>@string/emulation_bottom_screen</item>
-        <item>@string/emulation_screen_layout_sidebyside</item>
-    </string-array>
-
     <integer-array name="portraitLayoutValues">
         <item>0</item>
         <item>2</item>
         <item>1</item>
     </integer-array>
 
-    <integer-array name="secondaryLayoutValues">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </integer-array>
-
     <string-array name="smallScreenPositions">
         <item>@string/small_screen_position_top_right</item>
         <item>@string/small_screen_position_middle_right</item>
@@ -148,12 +134,12 @@
     </integer-array>
 
     <string-array name="statsPosition">
-        <item>@string/performance_overlay_position_top_left</item>
+        <item>@string/overlay_position_top_left</item>
-        <item>@string/performance_overlay_position_center_top</item>
+        <item>@string/overlay_position_center_top</item>
-        <item>@string/performance_overlay_position_top_right</item>
+        <item>@string/overlay_position_top_right</item>
-        <item>@string/performance_overlay_position_bottom_left</item>
+        <item>@string/overlay_position_bottom_left</item>
-        <item>@string/performance_overlay_position_center_bottom</item>
+        <item>@string/overlay_position_center_bottom</item>
-        <item>@string/performance_overlay_position_bottom_right</item>
+        <item>@string/overlay_position_bottom_right</item>
     </string-array>
     <integer-array name="statsPositionValues">
         <item>0</item>

src/android/app/src/main/res/values/strings.xml

@@ -214,9 +214,6 @@
     <string name="region_mismatch">Region Mismatch Warning</string>
     <string name="region_mismatch_emulated">The country setting is not valid for the selected emulated region.</string>
     <string name="region_mismatch_console">The country setting is not valid for the current linked console.</string>
-    <string name="storage">Storage</string>
-    <string name="compress_cia_installs">Compress installed CIA content</string>
-    <string name="compress_cia_installs_description">Compresses the content of CIA files when installed to the emulated SD card. Only affects CIA content which is installed while the setting is enabled.</string>
 
     <!-- Camera settings strings -->
     <string name="inner_camera">Inner Camera</string>
@@ -238,27 +235,25 @@
     <string name="spirv_shader_gen_description">Emits the fragment shader used to emulate PICA using SPIR-V instead of GLSL</string>
     <string name="disable_spirv_optimizer">Disable SPIR-V Optimizer</string>
     <string name="disable_spirv_optimizer_description">Disables the SPIR-V optimization pass, reducing stuttering considerably while barely affecting performance.</string>
-    <string name="async_shaders">Enable Asynchronous Shader Compilation</string>
+    <string name="async_shaders">Enable asynchronous shader compilation</string>
     <string name="async_shaders_description">Compiles shaders in the background to reduce stuttering during gameplay. When enabled expect temporary graphical glitches</string>
     <string name="linear_filtering">Linear Filtering</string>
     <string name="linear_filtering_description">Enables linear filtering, which causes game visuals to appear smoother.</string>
     <string name="texture_filter_name">Texture Filter</string>
     <string name="texture_filter_description">Enhances the visuals of applications by applying a filter to textures. The supported filters are Anime4K Ultrafast, Bicubic, ScaleForce, xBRZ freescale, and MMPX.</string>
-    <string name="delay_render_thread">Delay Game Render Thread</string>
+    <string name="delay_render_thread">Delay game render thread</string>
     <string name="delay_render_thread_description">Delay the game render thread when it submits data to the GPU. Helps with performance issues in the (very few) applications with dynamic framerates.</string>
     <string name="advanced">Advanced</string>
     <string name="texture_sampling_name">Texture Sampling</string>
     <string name="texture_sampling_description">Overrides the sampling filter used by games. This can be useful in certain cases with poorly behaved games when upscaling. If unsure, set this to Game Controlled.</string>
     <string name="shaders_accurate_mul">Accurate Multiplication</string>
     <string name="shaders_accurate_mul_description">Uses more accurate multiplication in hardware shaders, which may fix some graphical bugs. When enabled, performance will be reduced.</string>
-    <string name="asynchronous_gpu">Enable Asynchronous GPU Emulation</string>
+    <string name="asynchronous_gpu">Enable asynchronous GPU emulation</string>
     <string name="asynchronous_gpu_description">Uses a separate thread to emulate the GPU asynchronously. When enabled, performance will be improved.</string>
     <string name="frame_limit_enable">Limit Speed</string>
     <string name="frame_limit_enable_description">When enabled, emulation speed will be limited to a specified percentage of normal speed. If disabled, emulation speed will be uncapped and the turbo speed hotkey will not work.</string>
     <string name="frame_limit_slider">Limit Speed Percent</string>
     <string name="frame_limit_slider_description">Specifies the percentage to limit emulation speed. With the default of 100% emulation will be limited to normal speed. Values higher or lower will increase or decrease the speed limit.</string>
-    <string name="android_hide_images">Hide 3DS Images from Android</string>
-    <string name="android_hide_images_description">Prevent 3DS camera, screenshot, and custom texture images from being indexed by Android and displayed in the gallery. Your device may need to be rebooted after changing this setting to take effect.</string>
     <string name="turbo_limit">Turbo Speed Limit</string>
     <string name="turbo_limit_description">Emulation speed limit used while the turbo hotkey is active.</string>
     <string name="expand_to_cutout_area">Expand to Cutout Area</string>
@@ -308,7 +303,7 @@
     <string name="audio_volume">Volume</string>
     <string name="audio_stretch">Audio Stretching</string>
     <string name="audio_stretch_description">Stretches audio to reduce stuttering. When enabled, increases audio latency and slightly reduces performance.</string>
-    <string name="realtime_audio">Enable Realtime Audio</string>
+    <string name="realtime_audio">Enable realtime audio</string>
     <string name="realtime_audio_description">Scales audio playback speed to account for drops in emulation framerate. This means that audio will play at full speed even while the game framerate is low. May cause audio desync issues.</string>
     <string name="audio_input_type">Audio Input Device</string>
     <string name="sound_output_mode">Sound Output Mode</string>
@@ -323,9 +318,9 @@
     <string name="vsync_description">Synchronizes the game frame rate to the refresh rate of your device.</string>
     <string name="renderer_debug">Debug Renderer</string>
     <string name="renderer_debug_description">Log additional graphics related debug information. When enabled, game performance will be significantly reduced.</string>
-    <string name="instant_debug_log">Flush Log Output on Every Message</string>
+    <string name="instant_debug_log">Flush log output on every message</string>
     <string name="instant_debug_log_description">Immediately commits the debug log to file. Use this if Azahar crashes and the log output is being cut.</string>
-    <string name="delay_start_lle_modules">Delay Start With LLE Modules</string>
+    <string name="delay_start_lle_modules">Delay start with LLE modules</string>
     <string name="delay_start_lle_modules_description">Delays the start of the app when LLE modules are enabled.</string>
     <string name="deterministic_async_operations">Deterministic Async Operations</string>
     <string name="deterministic_async_operations_description">Makes async operations deterministic for debugging. Enabling this may cause freezes.</string>
@@ -423,10 +418,6 @@
     <string name="emulation_configure_controls">Configure Controls</string>
     <string name="emulation_edit_layout">Edit Layout</string>
     <string name="emulation_done">Done</string>
-    <string name="emulation_button_sliding">Button Sliding</string>
-    <string name="emulation_button_sliding_disabled">Hold originally pressed button</string>
-    <string name="emulation_button_sliding_enabled">Hold currently pressed button</string>
-    <string name="emulation_button_sliding_alternative">Hold original and currently pressed button</string>
     <string name="emulation_toggle_controls">Toggle Controls</string>
     <string name="emulation_control_scale">Adjust Scale</string>
     <string name="emulation_control_scale_global">Global Scale</string>
@@ -439,8 +430,6 @@
     <string name="emulation_aspect_ratio">Aspect Ratio</string>
     <string name="emulation_switch_screen_layout">Landscape Screen Layout</string>
     <string name="emulation_switch_portrait_layout">Portrait Screen Layout</string>
-    <string name="emulation_switch_secondary_layout">Secondary Display Screen Layout</string>
-    <string name="emulation_switch_secondary_layout_description">The layout used by a connected secondary screen, wired or wireless (Chromecast, Miracast)</string>
     <string name="emulation_screen_layout_largescreen">Large Screen</string>
     <string name="emulation_screen_layout_portrait">Portrait</string>
     <string name="emulation_screen_layout_single">Single Screen</string>
@@ -448,15 +437,7 @@
     <string name="emulation_screen_layout_hybrid">Hybrid Screens</string>
     <string name="emulation_screen_layout_original">Original</string>
     <string name="emulation_portrait_layout_top_full">Default</string>
-    <string name="emulation_secondary_display_default">System Default (mirror)</string>
     <string name="emulation_screen_layout_custom">Custom Layout</string>
-    <string name="bg_color">Background Color</string>
-    <string name="bg_color_description">The color which appears behind the screens during emulation, represented as an RGB value.</string>
-    <string name="bg_red">Red</string>
-    <string name="bg_green">Green</string>
-    <string name="bg_blue">Blue</string>
-    <string name="second_screen_opacity">Custom Layout Second Screen Opacity</string>
-    <string name="second_screen_opacity_description">The opacity of the second 3DS screen when using a custom screen layout. Useful if the second screen is to be positioned on top of the first screen.</string>
     <string name="emulation_small_screen_position">Small Screen Position</string>
     <string name="small_screen_position_description">Where should the small screen appear relative to the large one in Large Screen Layout?</string>
     <string name="small_screen_position_top_right">Top Right</string>
@@ -551,6 +532,7 @@
     <string name="save_load_error">Save/Load Error</string>
     <string name="fatal_error">Fatal Error</string>
     <string name="fatal_error_message">A fatal error occurred. Check the log for details.\nContinuing emulation may result in crashes and bugs.</string>
+    <string name="invalid_region">Invalid region</string>
     <string name="unsupported_encrypted">Unsupported encrypted application</string>
 
     <!-- Disk Shader Cache -->
@@ -576,37 +558,34 @@
     <string name="create_shortcut">Create Shortcut</string>
     <string name="shortcut_name_empty">Shortcut name cannot be empty</string>
     <string name="shortcut_image_stretch_toggle">Stretch to fit image</string>
-    <string name="game_context_id">ID:</string>
-    <string name="game_context_file">File:</string>
-    <string name="game_context_type">Type:</string>
 
     <!-- Performance Overlay settings -->
     <string name="performance_overlay_show">Show Performance Overlay</string>
     <string name="performance_overlay_options">Performance Overlay</string>
     <string name="performance_overlay_enable">Enable Performance Overlay</string>
     <string name="performance_overlay_options_description">Configure whether the performance overlay is shown and what information is displayed.</string>
-    <string name="performance_overlay_show_fps">Show FPS</string>
+    <string name="overlay_show_fps">Show FPS</string>
-    <string name="performance_overlay_show_fps_description">Display current frames per second.</string>
+    <string name="overlay_show_fps_description">Display current frames per second.</string>
-    <string name="performance_overlay_show_frametime">Show Frametime</string>
+    <string name="overlay_show_frametime">Show Frametime</string>
-    <string name="performance_overlay_show_frametime_description">Display current frametime.</string>
+    <string name="overlay_show_frametime_description">Display current frametime.</string>
-    <string name="performance_overlay_show_speed">Show Speed</string>
+    <string name="overlay_show_speed">Show Speed</string>
-    <string name="performance_overlay_show_speed_description">Display current emulation speed percentage.</string>
+    <string name="overlay_show_speed_description">Display current emulation speed percentage.</string>
-    <string name="performance_overlay_show_app_ram_usage">Show App Memory Usage</string>
+    <string name="overlay_show_app_ram_usage">Show App Memory Usage</string>
-    <string name="performance_overlay_show_app_ram_usage_description">Display the amount of RAM getting used by the emulator.</string>
+    <string name="overlay_show_app_ram_usage_description">Display the amount of RAM getting used by the emulator.</string>
-    <string name="performance_overlay_show_available_ram">Show Available Memory</string>
+    <string name="overlay_show_available_ram">Show Available Memory</string>
-    <string name="performance_overlay_show_available_ram_description">Display the amount of RAM which is available.</string>
+    <string name="overlay_show_available_ram_description">Display the amount of RAM which is available.</string>
-    <string name="performance_overlay_show_battery_temp">Show Battery Temperature</string>
+    <string name="overlay_show_battery_temp">Show Battery Temperature</string>
-    <string name="performance_overlay_show_battery_temp_description">Display current Battery temperature in Celsius and Fahrenheit.</string>
+    <string name="overlay_show_battery_temp_description">Display current Battery temperature in Celsius and Fahrenheit.</string>
-    <string name="performance_overlay_position">Overlay Position</string>
+    <string name="overlay_position">Overlay Position</string>
-    <string name="performance_overlay_position_description">Choose where the performance overlay is displayed on the screen.</string>
+    <string name="overlay_position_description">Choose where the performance overlay is displayed on the screen.</string>
-    <string name="performance_overlay_position_top_left">Top Left</string>
+    <string name="overlay_position_top_left">Top Left</string>
-    <string name="performance_overlay_position_top_right">Top Right</string>
+    <string name="overlay_position_top_right">Top Right</string>
-    <string name="performance_overlay_position_bottom_left">Bottom Left</string>
+    <string name="overlay_position_bottom_left">Bottom Left</string>
-    <string name="performance_overlay_position_bottom_right">Bottom Right</string>
+    <string name="overlay_position_bottom_right">Bottom Right</string>
-    <string name="performance_overlay_position_center_top">Center Top</string>
+    <string name="overlay_position_center_top">Center Top</string>
-    <string name="performance_overlay_position_center_bottom">Center Bottom</string>
+    <string name="overlay_position_center_bottom">Center Bottom</string>
-    <string name="performance_overlay_background">Overlay Background</string>
+    <string name="overlay_background">Overlay Background</string>
-    <string name="performance_overlay_background_description">Adds a background behind the overlay for easier reading.</string>
+    <string name="overlay_background_description">Adds a background behind the overlay for easier reading.</string>
 
     <!-- Cheats -->
     <string name="cheats">Cheats</string>

src/android/build.gradle.kts

@@ -4,14 +4,14 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.11.1" apply false
+    id("com.android.application") version "8.8.1" apply false
-    id("com.android.library") version "8.11.1" apply false
+    id("com.android.library") version "8.8.1" apply false
     id("org.jetbrains.kotlin.android") version "2.0.20" apply false
     id("org.jetbrains.kotlin.plugin.serialization") version "2.0.20"
 }
 
 tasks.register("clean").configure {
-    delete(rootProject.layout.buildDirectory)
+    delete(rootProject.buildDir)
 }
 
 buildscript {

src/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip

src/audio_core/hle/aac_decoder.cpp

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -8,13 +8,31 @@
 namespace AudioCore::HLE {
 
 AACDecoder::AACDecoder(Memory::MemorySystem& memory) : memory(memory) {
-    OpenNewDecoder();
+    decoder = NeAACDecOpen();
+    if (decoder == nullptr) {
+        LOG_CRITICAL(Audio_DSP, "Could not open FAAD2 decoder.");
+        return;
+    }
+
+    auto config = NeAACDecGetCurrentConfiguration(decoder);
+    config->defObjectType = LC;
+    config->outputFormat = FAAD_FMT_16BIT;
+    if (!NeAACDecSetConfiguration(decoder, config)) {
+        LOG_CRITICAL(Audio_DSP, "Could not configure FAAD2 decoder.");
+        NeAACDecClose(decoder);
+        decoder = nullptr;
+        return;
+    }
+
+    LOG_INFO(Audio_DSP, "Created FAAD2 AAC decoder.");
 }
 
 AACDecoder::~AACDecoder() {
     if (decoder) {
         NeAACDecClose(decoder);
         decoder = nullptr;
+
+        LOG_INFO(Audio_DSP, "Destroyed FAAD2 AAC decoder.");
     }
 }
 
@@ -34,9 +52,6 @@ BinaryMessage AACDecoder::ProcessRequest(const BinaryMessage& request) {
     case DecoderCommand::Init: {
         BinaryMessage response = request;
         response.header.result = ResultStatus::Success;
-        if (!OpenNewDecoder()) {
-            response.header.result = ResultStatus::Error;
-        }
         return response;
     }
     case DecoderCommand::EncodeDecode: {
@@ -74,7 +89,6 @@ BinaryMessage AACDecoder::Decode(const BinaryMessage& request) {
     response.decode_aac_response.num_samples = 1024;
 
     if (decoder == nullptr) {
-        LOG_ERROR(Audio_DSP, "Failed to handle decode request: FAAD2 AAC decoder not open.");
         return response;
     }
 
@@ -88,22 +102,17 @@ BinaryMessage AACDecoder::Decode(const BinaryMessage& request) {
     u8* data = memory.GetFCRAMPointer(request.decode_aac_request.src_addr - Memory::FCRAM_PADDR);
     u32 data_len = request.decode_aac_request.size;
 
-    if (!decoder_initialized) {
     unsigned long sample_rate;
     u8 num_channels;
     auto init_result = NeAACDecInit(decoder, data, data_len, &sample_rate, &num_channels);
     if (init_result < 0) {
-            LOG_ERROR(Audio_DSP, "Could not initialize FAAD2 AAC decoder for request: {}",
+        LOG_ERROR(Audio_DSP, "Could not initialize FAAD2 AAC decoder for request: {}", init_result);
-                      init_result);
         return response;
     }
 
-        decoder_initialized = true;
-
     // Advance past the frame header if needed.
     data += init_result;
     data_len -= init_result;
-    }
 
     std::array<std::vector<s16>, 2> out_streams;
 
@@ -116,10 +125,6 @@ BinaryMessage AACDecoder::Decode(const BinaryMessage& request) {
             return response;
         }
 
-        // Set the output frame info.
-        response.decode_aac_response.sample_rate = GetSampleRateEnum(frame_info.samplerate);
-        response.decode_aac_response.num_channels = frame_info.channels;
-
         // Split the decode result into channels.
         u32 num_samples = frame_info.samples / frame_info.channels;
         for (u32 sample = 0; sample < num_samples; sample++) {
@@ -150,34 +155,11 @@ BinaryMessage AACDecoder::Decode(const BinaryMessage& request) {
     }
 
     // Set the output frame info.
+    response.decode_aac_response.sample_rate = GetSampleRateEnum(sample_rate);
+    response.decode_aac_response.num_channels = num_channels;
     response.decode_aac_response.num_samples = static_cast<u32_le>(out_streams[0].size());
 
     return response;
 }
 
-bool AACDecoder::OpenNewDecoder() {
-    if (decoder) {
-        NeAACDecClose(decoder);
-    }
-    decoder_initialized = false;
-
-    decoder = NeAACDecOpen();
-    if (decoder == nullptr) {
-        LOG_CRITICAL(Audio_DSP, "Could not open FAAD2 decoder.");
-        return false;
-    }
-
-    auto config = NeAACDecGetCurrentConfiguration(decoder);
-    config->defObjectType = LC;
-    config->outputFormat = FAAD_FMT_16BIT;
-    if (!NeAACDecSetConfiguration(decoder, config)) {
-        LOG_CRITICAL(Audio_DSP, "Could not configure FAAD2 decoder.");
-        NeAACDecClose(decoder);
-        decoder = nullptr;
-        return false;
-    }
-
-    return true;
-}
-
 } // namespace AudioCore::HLE

src/audio_core/hle/aac_decoder.h

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -18,11 +18,9 @@ public:
 
 private:
     BinaryMessage Decode(const BinaryMessage& request);
-    bool OpenNewDecoder();
 
     Memory::MemorySystem& memory;
     NeAACDecHandle decoder = nullptr;
-    bool decoder_initialized = false;
 };
 
 } // namespace AudioCore::HLE

src/audio_core/sink.h

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2016 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -9,7 +9,7 @@
 
 namespace AudioCore {
 
-constexpr char auto_device_name[] = "Auto";
+constexpr char auto_device_name[] = "auto";
 
 /**
  * This class is an interface for an audio sink. An audio sink accepts samples in stereo signed

src/citra_meta/CMakeLists.txt

@@ -60,10 +60,6 @@ if (ENABLE_QT AND UNIX AND NOT APPLE)
     target_link_libraries(citra_meta PRIVATE Qt6::DBus gamemode)
 endif()
 
-if (ENABLE_QT AND APPLE)
-    target_link_libraries(citra_meta PRIVATE Qt6::GuiPrivate)
-endif()
-
 if (ENABLE_QT AND USE_DISCORD_PRESENCE)
     target_link_libraries(citra_meta PRIVATE discord-rpc)
 endif()