android: Reshape the layout to fit rotation

.codespellrc

@@ -2,5 +2,5 @@
 ; SPDX-License-Identifier: GPL-2.0-or-later
 
 [codespell]
-skip = ./.git,./build,./dist,./Doxyfile,./externals,./LICENSES,./src/android/app/src/main/res
-ignore-words-list = aci,allright,ba,deques,froms,hda,inout,lod,masia,nam,nax,nd,optin,pullrequests,pullrequest,te,transfered,unstall,uscaled,zink
+skip = ./.git,./build,./dist,./Doxyfile,./externals,./LICENSES
+ignore-words-list = aci,allright,ba,deques,froms,hda,inout,lod,masia,nam,nax,nd,pullrequests,pullrequest,te,transfered,unstall,uscaled,zink

.github/workflows/build.yml

@@ -129,11 +129,6 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - name: set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'adopt'
       - name: Set up cache
         uses: actions/cache@v3
         with:
@@ -165,3 +160,24 @@ jobs:
         with:
           name: android
           path: artifacts/
+  release:
+    runs-on: ubuntu-latest
+    needs: [ android ]
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    steps:
+      - uses: actions/download-artifact@v3
+      - name: Create release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref_name }}
+          release_name: ${{ github.ref_name }}
+          draft: false
+          prerelease: false
+      - name: Upload artifacts
+        uses: alexellis/upload-assets@0.4.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          asset_paths: '["./**/*.tar.*","./**/*.AppImage","./**/*.7z","./**/*.zip","./**/*.apk","./**/*.aab"]'

.gitignore

@@ -26,8 +26,6 @@ CMakeSettings.json
 # OSX global filetypes
 # Created by Finder or Spotlight in directories for various OS functionality (indexing, etc)
 .DS_Store
-.DS_Store?
-._*
 .AppleDouble
 .LSOverride
 .Spotlight-V100

.gitmodules

@@ -2,35 +2,35 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 [submodule "enet"]
-	path = externals/enet
-	url = https://github.com/lsalzman/enet.git
+    path = externals/enet
+    url = https://github.com/lsalzman/enet.git
 [submodule "inih"]
-	path = externals/inih/inih
-	url = https://github.com/benhoyt/inih.git
+    path = externals/inih/inih
+    url = https://github.com/benhoyt/inih.git
 [submodule "cubeb"]
-	path = externals/cubeb
-	url = https://github.com/mozilla/cubeb.git
+    path = externals/cubeb
+    url = https://github.com/mozilla/cubeb.git
 [submodule "dynarmic"]
-	path = externals/dynarmic
-	url = https://github.com/merryhime/dynarmic.git
+    path = externals/dynarmic
+    url = https://github.com/MerryMage/dynarmic.git
 [submodule "libusb"]
 	path = externals/libusb/libusb
 	url = https://github.com/libusb/libusb.git
 [submodule "discord-rpc"]
-	path = externals/discord-rpc
-	url = https://github.com/yuzu-emu/discord-rpc.git
+    path = externals/discord-rpc
+    url = https://github.com/yuzu-emu/discord-rpc.git
 [submodule "Vulkan-Headers"]
-	path = externals/Vulkan-Headers
-	url = https://github.com/KhronosGroup/Vulkan-Headers.git
+    path = externals/Vulkan-Headers
+    url = https://github.com/KhronosGroup/Vulkan-Headers.git
 [submodule "sirit"]
-	path = externals/sirit
-	url = https://github.com/yuzu-emu/sirit.git
+    path = externals/sirit
+    url = https://github.com/yuzu-emu/sirit
 [submodule "mbedtls"]
-	path = externals/mbedtls
-	url = https://github.com/yuzu-emu/mbedtls.git
+    path = externals/mbedtls
+    url = https://github.com/yuzu-emu/mbedtls
 [submodule "xbyak"]
-	path = externals/xbyak
-	url = https://github.com/herumi/xbyak.git
+    path = externals/xbyak
+    url = https://github.com/herumi/xbyak.git
 [submodule "opus"]
 	path = externals/opus/opus
 	url = https://github.com/xiph/opus.git
@@ -45,16 +45,10 @@
 	url = https://github.com/FFmpeg/FFmpeg.git
 [submodule "vcpkg"]
 	path = externals/vcpkg
-	url = https://github.com/microsoft/vcpkg.git
+	url = https://github.com/Microsoft/vcpkg.git
 [submodule "cpp-jwt"]
 	path = externals/cpp-jwt
 	url = https://github.com/arun11299/cpp-jwt.git
-[submodule "libadrenotools"]
+[submodule "externals/libadrenotools"]
 	path = externals/libadrenotools
-	url = https://github.com/bylaws/libadrenotools.git
-[submodule "tzdb_to_nx"]
-	path = externals/nx_tzdb/tzdb_to_nx
-	url = https://github.com/lat9nq/tzdb_to_nx.git
-[submodule "VulkanMemoryAllocator"]
-	path = externals/vma/VulkanMemoryAllocator
-	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+	url = https://github.com/bylaws/libadrenotools

CMakeLists.txt

@@ -59,8 +59,6 @@ option(YUZU_CHECK_SUBMODULES "Check if submodules are present" ON)
 
 option(YUZU_ENABLE_LTO "Enable link-time optimization" OFF)
 
-option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" OFF)
-
 CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF)
 
 # On Android, fetch and compile libcxx before doing anything else
@@ -257,7 +255,7 @@ endif()
 # boost asio's concept usage doesn't play nicely with some compilers yet.
 add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
 if (MSVC)
-    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++20>)
+    add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>)
 
     # boost still makes use of deprecated result_of.
     add_definitions(-D_HAS_DEPRECATED_RESULT_OF)
@@ -489,7 +487,7 @@ if (ENABLE_SDL2)
     if (YUZU_USE_BUNDLED_SDL2)
         # Detect toolchain and platform
         if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
-            set(SDL2_VER "SDL2-2.28.0")
+            set(SDL2_VER "SDL2-2.0.18")
         else()
             message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")
         endif()
@@ -509,7 +507,7 @@ if (ENABLE_SDL2)
     elseif (YUZU_USE_EXTERNAL_SDL2)
         message(STATUS "Using SDL2 from externals.")
     else()
-        find_package(SDL2 2.26.4 REQUIRED)
+        find_package(SDL2 2.0.18 REQUIRED)
     endif()
 endif()
 

README.md

@@ -13,7 +13,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
 
 <h4 align="center"><b>yuzu</b> is the world's most popular, open-source, Nintendo Switch emulator — started by the creators of <a href="https://citra-emu.org" target="_blank">Citra</a>.
 <br>
-It is written in C++ with portability in mind, and we actively maintain builds for Windows, Linux and Android.
+It is written in C++ with portability in mind, and we actively maintain builds for Windows and Linux.
 </h4>
 
 <p align="center">

externals/CMakeLists.txt

@@ -63,9 +63,8 @@ if (YUZU_USE_EXTERNAL_SDL2)
         # Yuzu itself needs: Atomic Audio Events Joystick Haptic Sensor Threads Timers
         # Since 2.0.18 Atomic+Threads required for HIDAPI/libusb (see https://github.com/libsdl-org/SDL/issues/5095)
         # Yuzu-cmd also needs: Video (depends on Loadso/Dlopen)
-        # CPUinfo also required for SDL Audio, at least until 2.28.0 (see https://github.com/libsdl-org/SDL/issues/7809)
         set(SDL_UNUSED_SUBSYSTEMS
-            File Filesystem
+            CPUinfo File Filesystem
             Locale Power Render)
         foreach(_SUB ${SDL_UNUSED_SUBSYSTEMS})
           string(TOUPPER ${_SUB} _OPT)
@@ -140,14 +139,6 @@ if (YUZU_USE_EXTERNAL_VULKAN_HEADERS)
     add_subdirectory(Vulkan-Headers)
 endif()
 
-# TZDB (Time Zone Database)
-add_subdirectory(nx_tzdb)
-
-# VMA
-add_library(vma vma/vma.cpp)
-target_include_directories(vma PUBLIC ./vma/VulkanMemoryAllocator/include)
-target_link_libraries(vma PRIVATE Vulkan::Headers)
-
 if (NOT TARGET LLVM::Demangle)
     add_library(demangle demangle/ItaniumDemangle.cpp)
     target_include_directories(demangle PUBLIC ./demangle)
@@ -157,9 +148,6 @@ endif()
 add_library(stb stb/stb_dxt.cpp)
 target_include_directories(stb PUBLIC ./stb)
 
-add_library(bc_decoder bc_decoder/bc_decoder.cpp)
-target_include_directories(bc_decoder PUBLIC ./bc_decoder)
-
 if (ANDROID)
    if (ARCHITECTURE_arm64)
        add_subdirectory(libadrenotools)

externals/bc_decoder/bc_decoder.h

@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: MPL-2.0
-// Copyright © 2022 Skyline Team and Contributors (https://github.com/skyline-emu/)
-
-#pragma once
-
-#include <cstdint>
-
-namespace bcn {
-    /**
-     * @brief Decodes a BC1 encoded image to R8G8B8A8
-     */
-    void DecodeBc1(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height);
-
-    /**
-     * @brief Decodes a BC2 encoded image to R8G8B8A8
-     */
-    void DecodeBc2(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height);
-
-    /**
-     * @brief Decodes a BC3 encoded image to R8G8B8A8
-     */
-    void DecodeBc3(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height);
-
-    /**
-     * @brief Decodes a BC4 encoded image to R8
-     */
-    void DecodeBc4(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height, bool isSigned);
-
-    /**
-     * @brief Decodes a BC5 encoded image to R8G8
-     */
-    void DecodeBc5(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height, bool isSigned);
-
-    /**
-     * @brief Decodes a BC6 encoded image to R16G16B16A16
-     */
-    void DecodeBc6(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height, bool isSigned);
-
-    /**
-     * @brief Decodes a BC7 encoded image to R8G8B8A8
-     */
-    void DecodeBc7(const uint8_t *src, uint8_t *dst, size_t x, size_t y, size_t width, size_t height);
-}

externals/nx_tzdb/CMakeLists.txt

@@ -1,101 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(NX_TZDB_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
-
-add_library(nx_tzdb INTERFACE)
-
-find_program(GIT git)
-find_program(GNU_MAKE make)
-find_program(DATE_PROG date)
-
-set(CAN_BUILD_NX_TZDB true)
-
-if (NOT GIT)
-    set(CAN_BUILD_NX_TZDB false)
-endif()
-if (NOT GNU_MAKE)
-    set(CAN_BUILD_NX_TZDB false)
-endif()
-if (NOT DATE_PROG)
-    set(CAN_BUILD_NX_TZDB false)
-endif()
-if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR ANDROID)
-    # tzdb_to_nx currently requires a posix-compliant host
-    # MinGW and Android are handled here due to the executable format being different from the host system
-    # TODO (lat9nq): cross-compiling support
-    set(CAN_BUILD_NX_TZDB false)
-endif()
-
-set(NX_TZDB_VERSION "220816")
-set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip")
-
-set(NX_TZDB_ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb")
-
-if ((NOT CAN_BUILD_NX_TZDB OR YUZU_DOWNLOAD_TIME_ZONE_DATA) AND NOT EXISTS ${NX_TZDB_ARCHIVE})
-    set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")
-
-    message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...")
-    file(DOWNLOAD ${NX_TZDB_DOWNLOAD_URL} ${NX_TZDB_ARCHIVE}
-        STATUS NX_TZDB_DOWNLOAD_STATUS)
-    list(GET NX_TZDB_DOWNLOAD_STATUS 0 NX_TZDB_DOWNLOAD_STATUS_CODE)
-    if (NOT NX_TZDB_DOWNLOAD_STATUS_CODE EQUAL 0)
-        message(FATAL_ERROR "Time zone data download failed (status code ${NX_TZDB_DOWNLOAD_STATUS_CODE})")
-    endif()
-
-    file(ARCHIVE_EXTRACT
-        INPUT
-            ${NX_TZDB_ARCHIVE}
-        DESTINATION
-            ${NX_TZDB_ROMFS_DIR})
-elseif (CAN_BUILD_NX_TZDB AND NOT YUZU_DOWNLOAD_TIME_ZONE_DATA)
-    add_subdirectory(tzdb_to_nx)
-    add_dependencies(nx_tzdb x80e)
-
-    set(NX_TZDB_ROMFS_DIR "${NX_TZDB_DIR}")
-endif()
-
-target_include_directories(nx_tzdb
-    INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
-    INTERFACE ${NX_TZDB_INCLUDE_DIR})
-
-function(CreateHeader ZONE_PATH HEADER_NAME)
-    set(HEADER_PATH "${NX_TZDB_INCLUDE_DIR}/nx_tzdb/${HEADER_NAME}.h")
-    add_custom_command(
-        OUTPUT
-            ${NX_TZDB_INCLUDE_DIR}/nx_tzdb/${HEADER_NAME}.h
-        COMMAND
-            ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/NxTzdbCreateHeader.cmake
-                ${ZONE_PATH}
-                ${HEADER_NAME}
-                ${NX_TZDB_INCLUDE_DIR}
-                ${CMAKE_CURRENT_SOURCE_DIR}
-        DEPENDS
-            tzdb_template.h.in
-            NxTzdbCreateHeader.cmake)
-
-    target_sources(nx_tzdb PRIVATE ${HEADER_PATH})
-endfunction()
-
-CreateHeader(${NX_TZDB_ROMFS_DIR} base)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo zoneinfo)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Africa africa)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America america)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/Argentina america_argentina)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/Indiana america_indiana)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/Kentucky america_kentucky)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/America/North_Dakota america_north_dakota)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Antarctica antarctica)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Arctic arctic)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Asia asia)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Atlantic atlantic)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Australia australia)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Brazil brazil)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Canada canada)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Chile chile)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Etc etc)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Europe europe)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Indian indian)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Mexico mexico)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/Pacific pacific)
-CreateHeader(${NX_TZDB_ROMFS_DIR}/zoneinfo/US us)

externals/nx_tzdb/ListFilesInDirectory.cmake

@@ -1,8 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# CMake does not have a way to list the files in a specific directory, 
-# so we need this script to do that for us in a platform-agnostic fashion
-
-file(GLOB FILE_LIST LIST_DIRECTORIES false RELATIVE ${CMAKE_SOURCE_DIR} "*")
-execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${FILE_LIST};")

externals/nx_tzdb/NxTzdbCreateHeader.cmake

@@ -1,46 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-set(ZONE_PATH ${CMAKE_ARGV3})
-set(HEADER_NAME ${CMAKE_ARGV4})
-set(NX_TZDB_INCLUDE_DIR ${CMAKE_ARGV5})
-set(NX_TZDB_SOURCE_DIR ${CMAKE_ARGV6})
-
-execute_process(
-    COMMAND ${CMAKE_COMMAND} -P ${NX_TZDB_SOURCE_DIR}/ListFilesInDirectory.cmake
-    WORKING_DIRECTORY ${ZONE_PATH}
-    OUTPUT_VARIABLE FILE_LIST)
-
-set(DIRECTORY_NAME ${HEADER_NAME})
-
-set(FILE_DATA "")
-foreach(ZONE_FILE ${FILE_LIST})
-    if (ZONE_FILE STREQUAL "\n")
-        continue()
-    endif()
-
-    string(APPEND FILE_DATA "{\"${ZONE_FILE}\",\n{")
-
-    file(READ ${ZONE_PATH}/${ZONE_FILE} ZONE_DATA HEX)
-    string(LENGTH "${ZONE_DATA}" ZONE_DATA_LEN)
-    foreach(I RANGE 0 ${ZONE_DATA_LEN} 2)
-        math(EXPR BREAK_LINE "(${I} + 2) % 38")
-
-        string(SUBSTRING "${ZONE_DATA}" "${I}" 2 HEX_DATA)
-        if (NOT HEX_DATA)
-            break()
-        endif()
-
-        string(APPEND FILE_DATA "0x${HEX_DATA},")
-        if (BREAK_LINE EQUAL 0)
-            string(APPEND FILE_DATA "\n")
-        else()
-            string(APPEND FILE_DATA " ")
-        endif()
-    endforeach()
-
-    string(APPEND FILE_DATA "}},\n")
-endforeach()
-
-file(READ ${NX_TZDB_SOURCE_DIR}/tzdb_template.h.in NX_TZDB_TEMPLATE_H_IN)
-file(CONFIGURE OUTPUT ${NX_TZDB_INCLUDE_DIR}/nx_tzdb/${HEADER_NAME}.h CONTENT "${NX_TZDB_TEMPLATE_H_IN}")

externals/nx_tzdb/include/nx_tzdb.h

@@ -1,27 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "nx_tzdb/africa.h"
-#include "nx_tzdb/america.h"
-#include "nx_tzdb/america_argentina.h"
-#include "nx_tzdb/america_indiana.h"
-#include "nx_tzdb/america_kentucky.h"
-#include "nx_tzdb/america_north_dakota.h"
-#include "nx_tzdb/antarctica.h"
-#include "nx_tzdb/arctic.h"
-#include "nx_tzdb/asia.h"
-#include "nx_tzdb/atlantic.h"
-#include "nx_tzdb/australia.h"
-#include "nx_tzdb/base.h"
-#include "nx_tzdb/brazil.h"
-#include "nx_tzdb/canada.h"
-#include "nx_tzdb/chile.h"
-#include "nx_tzdb/etc.h"
-#include "nx_tzdb/europe.h"
-#include "nx_tzdb/indian.h"
-#include "nx_tzdb/mexico.h"
-#include "nx_tzdb/pacific.h"
-#include "nx_tzdb/us.h"
-#include "nx_tzdb/zoneinfo.h"

externals/nx_tzdb/tzdb_template.h.in

@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <cstdint>
-#include <map>
-#include <vector>
-
-namespace NxTzdb {
-
-// clang-format off
-const static std::map<const char*, const std::vector<uint8_t>> @DIRECTORY_NAME@ = 
-{
-@FILE_DATA@};
-// clang-format on
-
-} // namespace NxTzdb

externals/vma/vma.cpp

@@ -1,8 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#define VMA_IMPLEMENTATION
-#define VMA_STATIC_VULKAN_FUNCTIONS 0
-#define VMA_DYNAMIC_VULKAN_FUNCTIONS 1
-
-#include <vk_mem_alloc.h>

src/CMakeLists.txt

@@ -43,7 +43,7 @@ if (MSVC)
         /Zo
         /permissive-
         /EHsc
-        /std:c++20
+        /std:c++latest
         /utf-8
         /volatile:iso
         /Zc:externConstexpr
@@ -51,10 +51,8 @@ if (MSVC)
         /Zc:throwingNew
         /GT
 
-        # Modules
-        /experimental:module- # Disable module support explicitly due to conflicts with precompiled headers
-
         # External headers diagnostics
+        /experimental:external  # Enables the external headers options. This option isn't required in Visual Studio 2019 version 16.10 and later
         /external:anglebrackets # Treats all headers included by #include <header>, where the header file is enclosed in angle brackets (< >), as external headers
         /external:W0            # Sets the default warning level to 0 for external headers, effectively turning off warnings for external headers
 

src/android/app/build.gradle.kts

@@ -2,17 +2,12 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import android.annotation.SuppressLint
-import kotlin.collections.setOf
-import org.jetbrains.kotlin.konan.properties.Properties
-import org.jlleitschuh.gradle.ktlint.reporter.ReporterType
 
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("kotlin-parcelize")
     kotlin("plugin.serialization") version "1.8.21"
-    id("androidx.navigation.safeargs.kotlin")
-    id("org.jlleitschuh.gradle.ktlint") version "11.4.0"
 }
 
 /**
@@ -26,7 +21,7 @@ val autoVersion = (((System.currentTimeMillis() / 1000) - 1451606400) / 10).toIn
 android {
     namespace = "org.yuzu.yuzu_emu"
 
-    compileSdkVersion = "android-34"
+    compileSdkVersion = "android-33"
     ndkVersion = "25.2.9519653"
 
     buildFeatures {
@@ -47,27 +42,23 @@ android {
         jniLibs.useLegacyPackaging = true
     }
 
+    lint {
+        // This is important as it will run lint but not abort on error
+        // Lint has some overly obnoxious "errors" that should really be warnings
+        abortOnError = false
+
+        //Uncomment disable lines for test builds...
+        //disable 'MissingTranslation'bin
+        //disable 'ExtraTranslation'
+    }
+
     defaultConfig {
         // TODO If this is ever modified, change application_id in strings.xml
         applicationId = "org.yuzu.yuzu_emu"
         minSdk = 30
-        targetSdk = 34
+        targetSdk = 33
         versionName = getGitVersion()
 
-        // If you want to use autoVersion for the versionCode, create a property in local.properties
-        // named "autoVersioned" and set it to "true"
-        val properties = Properties()
-        val versionProperty = try {
-            properties.load(project.rootProject.file("local.properties").inputStream())
-            properties.getProperty("autoVersioned") ?: ""
-        } catch (e: Exception) { "" }
-
-        versionCode = if (versionProperty == "true") {
-            autoVersion
-        } else {
-            1
-        }
-
         ndk {
             @SuppressLint("ChromeOsAbiSupport")
             abiFilters += listOf("arm64-v8a")
@@ -82,7 +73,16 @@ android {
 
         // Signed by release key, allowing for upload to Play Store.
         release {
-            resValue("string", "app_name_suffixed", "yuzu")
+            signingConfig = signingConfigs.getByName("debug")
+            isMinifyEnabled = true
+            isDebuggable = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android.txt"),
+                "proguard-rules.pro"
+            )
+        }
+
+        register("relWithVersionCode") {
             signingConfig = signingConfigs.getByName("debug")
             isMinifyEnabled = true
             isDebuggable = false
@@ -95,7 +95,6 @@ android {
         // builds a release build that doesn't need signing
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         register("relWithDebInfo") {
-            resValue("string", "app_name_suffixed", "yuzu Debug Release")
             signingConfig = signingConfigs.getByName("debug")
             isMinifyEnabled = true
             isDebuggable = true
@@ -103,19 +102,16 @@ android {
                 getDefaultProguardFile("proguard-android.txt"),
                 "proguard-rules.pro"
             )
-            versionNameSuffix = "-relWithDebInfo"
-            applicationIdSuffix = ".relWithDebInfo"
+            versionNameSuffix = "-debug"
             isJniDebuggable = true
         }
 
         // Signed by debug key disallowing distribution on Play Store.
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         debug {
-            resValue("string", "app_name_suffixed", "yuzu Debug")
             isDebuggable = true
             isJniDebuggable = true
             versionNameSuffix = "-debug"
-            applicationIdSuffix = ".debug"
         }
     }
 
@@ -160,42 +156,24 @@ android {
     }
 }
 
-tasks.getByPath("preBuild").dependsOn("ktlintCheck")
-
-ktlint {
-    version.set("0.47.1")
-    android.set(true)
-    ignoreFailures.set(false)
-    disabledRules.set(
-        setOf(
-            "no-wildcard-imports",
-            "package-name",
-            "import-ordering"
-        )
-    )
-    reporters {
-        reporter(ReporterType.CHECKSTYLE)
-    }
-}
-
 dependencies {
     implementation("androidx.core:core-ktx:1.10.1")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.recyclerview:recyclerview:1.3.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.fragment:fragment-ktx:1.6.0")
+    implementation("androidx.fragment:fragment-ktx:1.5.7")
     implementation("androidx.documentfile:documentfile:1.0.1")
     implementation("com.google.android.material:material:1.9.0")
     implementation("androidx.preference:preference:1.2.0")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
     implementation("io.coil-kt:coil:2.2.2")
     implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.window:window:1.1.0")
+    implementation("androidx.window:window:1.0.0")
     implementation("org.ini4j:ini4j:0.5.4")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.6.0")
-    implementation("androidx.navigation:navigation-ui-ktx:2.6.0")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.5.3")
+    implementation("androidx.navigation:navigation-ui-ktx:2.5.3")
     implementation("info.debatty:java-string-similarity:2.0.0")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
 }

src/android/app/src/main/AndroidManifest.xml

@@ -6,27 +6,32 @@ SPDX-License-Identifier: GPL-3.0-or-later
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-    <uses-feature android:name="android.hardware.gamepad" android:required="false" />
-    <uses-feature android:name="android.software.leanback" android:required="false" />
-    <uses-feature android:name="android.hardware.vulkan.version" android:version="0x401000" android:required="true" />
+    <uses-feature
+        android:name="android.hardware.touchscreen"
+        android:required="false"/>
+    <uses-feature
+        android:name="android.hardware.gamepad"
+        android:required="false"/>
+
+    <uses-feature
+        android:name="android.hardware.vulkan.version"
+        android:version="0x401000"
+        android:required="true" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name="org.yuzu.yuzu_emu.YuzuApplication"
-        android:label="@string/app_name_suffixed"
+        android:label="@string/app_name"
         android:icon="@drawable/ic_launcher"
         android:allowBackup="true"
         android:hasFragileUserData="true"
         android:supportsRtl="true"
         android:isGame="true"
-        android:localeConfig="@xml/locales_config"
-        android:banner="@drawable/tv_banner"
+        android:banner="@drawable/ic_launcher"
         android:extractNativeLibs="true"
         android:fullBackupContent="@xml/data_extraction_rules"
         android:dataExtractionRules="@xml/data_extraction_rules_api_31"
@@ -39,10 +44,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
             <!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
 
@@ -54,6 +58,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
         <activity
             android:name="org.yuzu.yuzu_emu.activities.EmulationActivity"
             android:theme="@style/Theme.Yuzu.Main"
+            android:launchMode="singleTop"
             android:screenOrientation="userLandscape"
             android:supportsPictureInPicture="true"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
@@ -70,9 +75,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 android:resource="@xml/nfc_tech_filter" />
         </activity>
 
-        <service android:name="org.yuzu.yuzu_emu.utils.ForegroundService" android:foregroundServiceType="specialUse">
-            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="Keep emulation running in background"/>
-        </service>
+        <service android:name="org.yuzu.yuzu_emu.utils.ForegroundService"/>
 
         <provider
             android:name=".features.DocumentProvider"

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -14,18 +14,16 @@ import android.widget.TextView
 import androidx.annotation.Keep
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.lang.ref.WeakReference
 import org.yuzu.yuzu_emu.YuzuApplication.Companion.appContext
 import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.utils.DocumentsTree.Companion.isNativePath
-import org.yuzu.yuzu_emu.utils.FileUtil.exists
 import org.yuzu.yuzu_emu.utils.FileUtil.getFileSize
-import org.yuzu.yuzu_emu.utils.FileUtil.isDirectory
 import org.yuzu.yuzu_emu.utils.FileUtil.openContentUri
 import org.yuzu.yuzu_emu.utils.Log.error
 import org.yuzu.yuzu_emu.utils.Log.verbose
 import org.yuzu.yuzu_emu.utils.Log.warning
 import org.yuzu.yuzu_emu.utils.SerializableHelper.serializable
+import java.lang.ref.WeakReference
 
 /**
  * Class which contains methods that interact
@@ -76,9 +74,7 @@ object NativeLibrary {
     fun openContentUri(path: String?, openmode: String?): Int {
         return if (isNativePath(path!!)) {
             YuzuApplication.documentsTree!!.openContentUri(path, openmode)
-        } else {
-            openContentUri(appContext, path, openmode)
-        }
+        } else openContentUri(appContext, path, openmode)
     }
 
     @Keep
@@ -86,29 +82,7 @@ object NativeLibrary {
     fun getSize(path: String?): Long {
         return if (isNativePath(path!!)) {
             YuzuApplication.documentsTree!!.getFileSize(path)
-        } else {
-            getFileSize(appContext, path)
-        }
-    }
-
-    @Keep
-    @JvmStatic
-    fun exists(path: String?): Boolean {
-        return if (isNativePath(path!!)) {
-            YuzuApplication.documentsTree!!.exists(path)
-        } else {
-            exists(appContext, path)
-        }
-    }
-
-    @Keep
-    @JvmStatic
-    fun isDirectory(path: String?): Boolean {
-        return if (isNativePath(path!!)) {
-            YuzuApplication.documentsTree!!.isDirectory(path)
-        } else {
-            isDirectory(appContext, path)
-        }
+        } else getFileSize(appContext, path)
     }
 
     /**
@@ -249,12 +223,8 @@ object NativeLibrary {
 
     external fun getCompany(filename: String): String
 
-    external fun isHomebrew(filename: String): Boolean
-
     external fun setAppDirectory(directory: String)
 
-    external fun installFileToNand(filename: String): Int
-
     external fun initializeGpuDriver(
         hookLibDir: String?,
         customDriverDir: String?,
@@ -286,7 +256,7 @@ object NativeLibrary {
     /**
      * Unpauses emulation from a paused state.
      */
-    external fun unpauseEmulation()
+    external fun unPauseEmulation()
 
     /**
      * Pauses emulation.
@@ -308,26 +278,6 @@ object NativeLibrary {
      */
     external fun isRunning(): Boolean
 
-    /**
-     * Returns true if emulation is paused.
-     */
-    external fun isPaused(): Boolean
-
-    /**
-     * Mutes emulation sound
-     */
-    external fun muteAudio(): Boolean
-
-    /**
-     * Unmutes emulation sound
-     */
-    external fun unmuteAudio(): Boolean
-
-    /**
-     * Returns true if emulation audio is muted.
-     */
-    external fun isMuted(): Boolean
-
     /**
      * Returns the performance stats for the current game
      */
@@ -477,9 +427,7 @@ object NativeLibrary {
                     Html.FROM_HTML_MODE_LEGACY
                 )
             )
-            .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
-                emulationActivity.finish()
-            }
+            .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int -> emulationActivity.finish() }
             .setOnDismissListener { emulationActivity.finish() }
         emulationActivity.runOnUiThread {
             val alert = builder.create()
@@ -557,15 +505,4 @@ object NativeLibrary {
         const val RELEASED = 0
         const val PRESSED = 1
     }
-
-    /**
-     * Result from installFileToNand
-     */
-    object InstallFileToNandResult {
-        const val Success = 0
-        const val SuccessFileOverwritten = 1
-        const val Error = 2
-        const val ErrorBaseGame = 3
-        const val ErrorFilenameExtension = 4
-    }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/YuzuApplication.kt

@@ -7,12 +7,12 @@ import android.app.Application
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
-import java.io.File
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.DocumentsTree
 import org.yuzu.yuzu_emu.utils.GpuDriverHelper
+import java.io.File
 
-fun Context.getPublicFilesDir(): File = getExternalFilesDir(null) ?: filesDir
+fun Context.getPublicFilesDir() : File = getExternalFilesDir(null) ?: filesDir
 
 class YuzuApplication : Application() {
     private fun createNotificationChannels() {
@@ -21,9 +21,7 @@ class YuzuApplication : Application() {
             getString(R.string.emulation_notification_channel_name),
             NotificationManager.IMPORTANCE_LOW
         )
-        emulationChannel.description = getString(
-            R.string.emulation_notification_channel_description
-        )
+        emulationChannel.description = getString(R.string.emulation_notification_channel_description)
         emulationChannel.setSound(null, null)
         emulationChannel.vibrationPattern = null
 
@@ -50,7 +48,7 @@ class YuzuApplication : Application() {
         GpuDriverHelper.initializeDriverParameters(applicationContext)
         NativeLibrary.logDeviceInfo()
 
-        createNotificationChannels()
+        createNotificationChannels();
     }
 
     companion object {

src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt

@@ -18,43 +18,51 @@ import android.hardware.Sensor
 import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
+import android.hardware.display.DisplayManager
 import android.os.Build
 import android.os.Bundle
+import android.util.DisplayMetrics
 import android.util.Rational
+import android.view.Display
 import android.view.InputDevice
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.Surface
 import android.view.View
+import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
-import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
-import androidx.navigation.fragment.NavHostFragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.window.layout.WindowInfoTracker
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.ActivityEmulationBinding
 import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
 import org.yuzu.yuzu_emu.features.settings.model.IntSetting
+import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.model.SettingsViewModel
+import org.yuzu.yuzu_emu.fragments.EmulationFragment
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.utils.ControllerMappingHelper
 import org.yuzu.yuzu_emu.utils.ForegroundService
 import org.yuzu.yuzu_emu.utils.InputHandler
-import org.yuzu.yuzu_emu.utils.MemoryUtil
 import org.yuzu.yuzu_emu.utils.NfcReader
+import org.yuzu.yuzu_emu.utils.SerializableHelper.parcelable
 import org.yuzu.yuzu_emu.utils.ThemeHelper
 import kotlin.math.roundToInt
 
 class EmulationActivity : AppCompatActivity(), SensorEventListener {
-    private lateinit var binding: ActivityEmulationBinding
-
     private var controllerMappingHelper: ControllerMappingHelper? = null
 
     var isActivityRecreated = false
+    private var emulationFragment: EmulationFragment? = null
     private lateinit var nfcReader: NfcReader
     private lateinit var inputHandler: InputHandler
 
@@ -65,11 +73,13 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
 
     private val actionPause = "ACTION_EMULATOR_PAUSE"
     private val actionPlay = "ACTION_EMULATOR_PLAY"
-    private val actionMute = "ACTION_EMULATOR_MUTE"
-    private val actionUnmute = "ACTION_EMULATOR_UNMUTE"
+
+    private lateinit var game: Game
 
     private val settingsViewModel: SettingsViewModel by viewModels()
 
+    var screenDimensions : IntArray = intArrayOf()
+
     override fun onDestroy() {
         stopForegroundService(this)
         super.onDestroy()
@@ -81,42 +91,47 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         settingsViewModel.settings.loadSettings()
 
         super.onCreate(savedInstanceState)
-
-        binding = ActivityEmulationBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        val navHostFragment =
-            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
-        val navController = navHostFragment.navController
-        navController
-            .setGraph(R.navigation.emulation_navigation, intent.extras)
-
-        isActivityRecreated = savedInstanceState != null
-
+        if (savedInstanceState == null) {
+            // Get params we were passed
+            game = intent.parcelable(EXTRA_SELECTED_GAME)!!
+            isActivityRecreated = false
+        } else {
+            isActivityRecreated = true
+            restoreState(savedInstanceState)
+        }
         controllerMappingHelper = ControllerMappingHelper()
 
         // Set these options now so that the SurfaceView the game renders into is the right size.
         enableFullscreenImmersive()
 
+        setContentView(R.layout.activity_emulation)
         window.decorView.setBackgroundColor(getColor(android.R.color.black))
 
+        screenDimensions = getDisplayParams()
+
+        // Find or create the EmulationFragment
+        emulationFragment =
+            supportFragmentManager.findFragmentById(R.id.frame_emulation_fragment) as EmulationFragment?
+        if (emulationFragment == null) {
+            emulationFragment = EmulationFragment.newInstance(game)
+            supportFragmentManager.beginTransaction()
+                .add(R.id.frame_emulation_fragment, emulationFragment!!)
+                .commit()
+        }
+        title = game.title
+
         nfcReader = NfcReader(this)
         nfcReader.initialize()
 
         inputHandler = InputHandler()
         inputHandler.initialize()
 
-        val memoryUtil = MemoryUtil(this)
-        if (memoryUtil.isLessThan(8, MemoryUtil.Gb)) {
-            Toast.makeText(
-                this,
-                getString(
-                    R.string.device_memory_inadequate,
-                    memoryUtil.getDeviceRAM(),
-                    "8 ${getString(R.string.memory_gigabyte)}"
-                ),
-                Toast.LENGTH_LONG
-            ).show()
+        lifecycleScope.launch(Dispatchers.Main) {
+            lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                WindowInfoTracker.getOrCreate(this@EmulationActivity)
+                    .windowLayoutInfo(this@EmulationActivity)
+                    .collect { emulationFragment?.updateFoldableLayout(this@EmulationActivity, it) }
+            }
         }
 
         // Start a foreground service to prevent the app from getting killed in the background
@@ -152,7 +167,17 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         nfcReader.startScanning()
         startMotionSensorListener()
 
-        buildPictureInPictureParams()
+        NativeLibrary.notifyOrientationChange(
+            Settings.LayoutOption_MobileLandscape,
+            Surface.ROTATION_90
+        )
+
+        val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
+            .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            pictureInPictureParamsBuilder.setAutoEnterEnabled(BooleanSetting.PICTURE_IN_PICTURE.boolean)
+        }
+        setPictureInPictureParams(pictureInPictureParamsBuilder.build())
     }
 
     override fun onPause() {
@@ -177,6 +202,11 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         nfcReader.onNewIntent(intent)
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putParcelable(EXTRA_SELECTED_GAME, game)
+        super.onSaveInstanceState(outState)
+    }
+
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
         if (event.source and InputDevice.SOURCE_JOYSTICK != InputDevice.SOURCE_JOYSTICK &&
             event.source and InputDevice.SOURCE_GAMEPAD != InputDevice.SOURCE_GAMEPAD
@@ -263,6 +293,10 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
 
     override fun onAccuracyChanged(sensor: Sensor, i: Int) {}
 
+    private fun restoreState(savedInstanceState: Bundle) {
+        game = savedInstanceState.parcelable(EXTRA_SELECTED_GAME)!!
+    }
+
     private fun enableFullscreenImmersive() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
@@ -273,141 +307,79 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         }
     }
 
-    private fun PictureInPictureParams.Builder.getPictureInPictureAspectBuilder():
-        PictureInPictureParams.Builder {
+    private fun PictureInPictureParams.Builder.getPictureInPictureAspectBuilder() : PictureInPictureParams.Builder {
         val aspectRatio = when (IntSetting.RENDERER_ASPECT_RATIO.int) {
             0 -> Rational(16, 9)
             1 -> Rational(4, 3)
             2 -> Rational(21, 9)
             3 -> Rational(16, 10)
-            else -> null // Best fit
+            else -> null
         }
         return this.apply { aspectRatio?.let { setAspectRatio(it) } }
     }
 
-    private fun PictureInPictureParams.Builder.getPictureInPictureActionsBuilder():
-        PictureInPictureParams.Builder {
-        val pictureInPictureActions: MutableList<RemoteAction> = mutableListOf()
+    private fun getDisplayParams(): IntArray {
+        return with (getSystemService(WINDOW_SERVICE) as WindowManager) {
+            val metrics = maximumWindowMetrics.bounds
+            intArrayOf(metrics.width(), metrics.height())
+        }
+    }
+
+    private fun PictureInPictureParams.Builder.getPictureInPictureActionsBuilder() : PictureInPictureParams.Builder {
+        val pictureInPictureActions : MutableList<RemoteAction> = mutableListOf()
         val pendingFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
 
-        if (NativeLibrary.isPaused()) {
+        val isEmulationPaused = emulationFragment?.isEmulationStatePaused() ?: false
+        if (isEmulationPaused) {
             val playIcon = Icon.createWithResource(this@EmulationActivity, R.drawable.ic_pip_play)
             val playPendingIntent = PendingIntent.getBroadcast(
-                this@EmulationActivity,
-                R.drawable.ic_pip_play,
-                Intent(actionPlay),
-                pendingFlags
-            )
-            val playRemoteAction = RemoteAction(
-                playIcon,
-                getString(R.string.play),
-                getString(R.string.play),
-                playPendingIntent
+                this@EmulationActivity, R.drawable.ic_pip_play, Intent(actionPlay), pendingFlags
             )
+            val playRemoteAction = RemoteAction(playIcon, getString(R.string.play), getString(R.string.play), playPendingIntent)
             pictureInPictureActions.add(playRemoteAction)
         } else {
             val pauseIcon = Icon.createWithResource(this@EmulationActivity, R.drawable.ic_pip_pause)
             val pausePendingIntent = PendingIntent.getBroadcast(
-                this@EmulationActivity,
-                R.drawable.ic_pip_pause,
-                Intent(actionPause),
-                pendingFlags
-            )
-            val pauseRemoteAction = RemoteAction(
-                pauseIcon,
-                getString(R.string.pause),
-                getString(R.string.pause),
-                pausePendingIntent
+                this@EmulationActivity, R.drawable.ic_pip_pause, Intent(actionPause), pendingFlags
             )
+            val pauseRemoteAction = RemoteAction(pauseIcon, getString(R.string.pause), getString(R.string.pause), pausePendingIntent)
             pictureInPictureActions.add(pauseRemoteAction)
         }
 
-        if (NativeLibrary.isMuted()) {
-            val unmuteIcon = Icon.createWithResource(
-                this@EmulationActivity,
-                R.drawable.ic_pip_unmute
-            )
-            val unmutePendingIntent = PendingIntent.getBroadcast(
-                this@EmulationActivity,
-                R.drawable.ic_pip_unmute,
-                Intent(actionUnmute),
-                pendingFlags
-            )
-            val unmuteRemoteAction = RemoteAction(
-                unmuteIcon,
-                getString(R.string.unmute),
-                getString(R.string.unmute),
-                unmutePendingIntent
-            )
-            pictureInPictureActions.add(unmuteRemoteAction)
-        } else {
-            val muteIcon = Icon.createWithResource(this@EmulationActivity, R.drawable.ic_pip_mute)
-            val mutePendingIntent = PendingIntent.getBroadcast(
-                this@EmulationActivity,
-                R.drawable.ic_pip_mute,
-                Intent(actionMute),
-                pendingFlags
-            )
-            val muteRemoteAction = RemoteAction(
-                muteIcon,
-                getString(R.string.mute),
-                getString(R.string.mute),
-                mutePendingIntent
-            )
-            pictureInPictureActions.add(muteRemoteAction)
-        }
-
         return this.apply { setActions(pictureInPictureActions) }
     }
 
-    fun buildPictureInPictureParams() {
-        val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
-            .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            pictureInPictureParamsBuilder.setAutoEnterEnabled(
-                BooleanSetting.PICTURE_IN_PICTURE.boolean
-            )
-        }
-        setPictureInPictureParams(pictureInPictureParamsBuilder.build())
-    }
-
     private var pictureInPictureReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent) {
+        override fun onReceive(context : Context?, intent : Intent) {
             if (intent.action == actionPlay) {
-                if (NativeLibrary.isPaused()) NativeLibrary.unpauseEmulation()
+                emulationFragment?.onPictureInPicturePlay()
             } else if (intent.action == actionPause) {
-                if (!NativeLibrary.isPaused()) NativeLibrary.pauseEmulation()
+                emulationFragment?.onPictureInPicturePause()
             }
-            if (intent.action == actionUnmute) {
-                if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
-            } else if (intent.action == actionMute) {
-                if (!NativeLibrary.isMuted()) NativeLibrary.muteAudio()
+            val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
+                .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                pictureInPictureParamsBuilder.setAutoEnterEnabled(BooleanSetting.PICTURE_IN_PICTURE.boolean)
             }
-            buildPictureInPictureParams()
+            setPictureInPictureParams(pictureInPictureParamsBuilder.build())
         }
     }
 
-    override fun onPictureInPictureModeChanged(
-        isInPictureInPictureMode: Boolean,
-        newConfig: Configuration
-    ) {
+    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         if (isInPictureInPictureMode) {
             IntentFilter().apply {
                 addAction(actionPause)
                 addAction(actionPlay)
-                addAction(actionMute)
-                addAction(actionUnmute)
             }.also {
                 registerReceiver(pictureInPictureReceiver, it)
             }
+            emulationFragment?.onPictureInPictureEnter()
         } else {
             try {
                 unregisterReceiver(pictureInPictureReceiver)
-            } catch (ignored: Exception) {
-            }
-            // Always resume audio, since there is no UI button
-            if (NativeLibrary.isMuted()) NativeLibrary.unmuteAudio()
+            } catch (ignored : Exception) { }
+            emulationFragment?.onPictureInPictureLeave()
         }
     }
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/GameAdapter.kt

@@ -16,7 +16,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.documentfile.provider.DocumentFile
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.findNavController
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.AsyncDifferConfig
 import androidx.recyclerview.widget.DiffUtil
@@ -24,13 +23,13 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import kotlinx.coroutines.launch
-import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.adapters.GameAdapter.GameViewHolder
 import org.yuzu.yuzu_emu.databinding.CardGameBinding
+import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.model.Game
+import org.yuzu.yuzu_emu.adapters.GameAdapter.GameViewHolder
 import org.yuzu.yuzu_emu.model.GamesViewModel
 
 class GameAdapter(private val activity: AppCompatActivity) :
@@ -59,10 +58,7 @@ class GameAdapter(private val activity: AppCompatActivity) :
     override fun onClick(view: View) {
         val holder = view.tag as GameViewHolder
 
-        val gameExists = DocumentFile.fromSingleUri(
-            YuzuApplication.appContext,
-            Uri.parse(holder.game.path)
-        )?.exists() == true
+        val gameExists = DocumentFile.fromSingleUri(YuzuApplication.appContext, Uri.parse(holder.game.path))?.exists() == true
         if (!gameExists) {
             Toast.makeText(
                 YuzuApplication.appContext,
@@ -82,8 +78,7 @@ class GameAdapter(private val activity: AppCompatActivity) :
             )
             .apply()
 
-        val action = HomeNavigationDirections.actionGlobalEmulationActivity(holder.game)
-        view.findNavController().navigate(action)
+        EmulationActivity.launch(activity, holder.game)
     }
 
     inner class GameViewHolder(val binding: CardGameBinding) :

src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/HomeSettingAdapter.kt

@@ -58,12 +58,11 @@ class HomeSettingAdapter(private val activity: AppCompatActivity, var options: L
             )
 
             when (option.titleId) {
-                R.string.get_early_access ->
-                    binding.optionLayout.background =
-                        ContextCompat.getDrawable(
-                            binding.optionCard.context,
-                            R.drawable.premium_background
-                        )
+                R.string.get_early_access -> binding.optionLayout.background =
+                    ContextCompat.getDrawable(
+                        binding.optionCard.context,
+                        R.drawable.premium_background
+                    )
             }
         }
     }

src/android/app/src/main/java/org/yuzu/yuzu_emu/applets/keyboard/SoftwareKeyboard.kt

@@ -12,10 +12,10 @@ import android.view.WindowInsets
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.Keep
 import androidx.core.view.ViewCompat
-import java.io.Serializable
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.applets.keyboard.ui.KeyboardDialogFragment
+import java.io.Serializable
 
 @Keep
 object SoftwareKeyboard {
@@ -40,22 +40,19 @@ object SoftwareKeyboard {
         // There isn't a good way to know that the IMM is dismissed, so poll every 500ms to submit inline keyboard result.
         val handler = Handler(Looper.myLooper()!!)
         val delayMs = 500
-        handler.postDelayed(
-            object : Runnable {
-                override fun run() {
-                    val insets = ViewCompat.getRootWindowInsets(overlayView)
-                    val isKeyboardVisible = insets!!.isVisible(WindowInsets.Type.ime())
-                    if (isKeyboardVisible) {
-                        handler.postDelayed(this, delayMs.toLong())
-                        return
-                    }
-
-                    // No longer visible, submit the result.
-                    NativeLibrary.submitInlineKeyboardInput(KeyEvent.KEYCODE_ENTER)
+        handler.postDelayed(object : Runnable {
+            override fun run() {
+                val insets = ViewCompat.getRootWindowInsets(overlayView)
+                val isKeyboardVisible = insets!!.isVisible(WindowInsets.Type.ime())
+                if (isKeyboardVisible) {
+                    handler.postDelayed(this, delayMs.toLong())
+                    return
                 }
-            },
-            delayMs.toLong()
-        )
+
+                // No longer visible, submit the result.
+                NativeLibrary.submitInlineKeyboardInput(KeyEvent.KEYCODE_ENTER)
+            }
+        }, delayMs.toLong())
     }
 
     @JvmStatic

src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress.kt

@@ -20,10 +20,7 @@ object DiskShaderCacheProgress {
                 emulationActivity.getString(R.string.loading),
                 emulationActivity.getString(R.string.preparing_shaders)
             )
-            fragment.show(
-                emulationActivity.supportFragmentManager,
-                ShaderProgressDialogFragment.TAG
-            )
+            fragment.show(emulationActivity.supportFragmentManager, ShaderProgressDialogFragment.TAG)
         }
         synchronized(finishLock) { finishLock.wait() }
     }

src/android/app/src/main/java/org/yuzu/yuzu_emu/disk_shader_cache/ui/ShaderProgressDialogFragment.kt

@@ -62,9 +62,7 @@ class ShaderProgressDialogFragment : DialogFragment() {
         shaderProgressViewModel.message.observe(viewLifecycleOwner) { msg ->
             alertDialog.setMessage(msg)
         }
-        synchronized(DiskShaderCacheProgress.finishLock) {
-            DiskShaderCacheProgress.finishLock.notifyAll()
-        }
+        synchronized(DiskShaderCacheProgress.finishLock) { DiskShaderCacheProgress.finishLock.notifyAll() }
     }
 
     override fun onDestroyView() {

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/DocumentProvider.kt

@@ -13,11 +13,11 @@ import android.os.ParcelFileDescriptor
 import android.provider.DocumentsContract
 import android.provider.DocumentsProvider
 import android.webkit.MimeTypeMap
-import java.io.*
 import org.yuzu.yuzu_emu.BuildConfig
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.getPublicFilesDir
+import java.io.*
 
 class DocumentProvider : DocumentsProvider() {
     private val baseDirectory: File
@@ -44,7 +44,7 @@ class DocumentProvider : DocumentsProvider() {
             DocumentsContract.Document.COLUMN_SIZE
         )
 
-        const val AUTHORITY: String = BuildConfig.APPLICATION_ID + ".user"
+        const val AUTHORITY : String = BuildConfig.APPLICATION_ID + ".user"
         const val ROOT_ID: String = "root"
     }
 
@@ -58,11 +58,7 @@ class DocumentProvider : DocumentsProvider() {
     private fun getFile(documentId: String): File {
         if (documentId.startsWith(ROOT_ID)) {
             val file = baseDirectory.resolve(documentId.drop(ROOT_ID.length + 1))
-            if (!file.exists()) {
-                throw FileNotFoundException(
-                    "${file.absolutePath} ($documentId) not found"
-                )
-            }
+            if (!file.exists()) throw FileNotFoundException("${file.absolutePath} ($documentId) not found")
             return file
         } else {
             throw FileNotFoundException("'$documentId' is not in any known root")
@@ -84,8 +80,7 @@ class DocumentProvider : DocumentsProvider() {
             add(DocumentsContract.Root.COLUMN_SUMMARY, null)
             add(
                 DocumentsContract.Root.COLUMN_FLAGS,
-                DocumentsContract.Root.FLAG_SUPPORTS_CREATE or
-                    DocumentsContract.Root.FLAG_SUPPORTS_IS_CHILD
+                DocumentsContract.Root.FLAG_SUPPORTS_CREATE or DocumentsContract.Root.FLAG_SUPPORTS_IS_CHILD
             )
             add(DocumentsContract.Root.COLUMN_TITLE, context!!.getString(R.string.app_name))
             add(DocumentsContract.Root.COLUMN_DOCUMENT_ID, getDocumentId(baseDirectory))
@@ -132,13 +127,11 @@ class DocumentProvider : DocumentsProvider() {
 
         try {
             if (DocumentsContract.Document.MIME_TYPE_DIR == mimeType) {
-                if (!newFile.mkdir()) {
+                if (!newFile.mkdir())
                     throw IOException("Failed to create directory")
-                }
             } else {
-                if (!newFile.createNewFile()) {
+                if (!newFile.createNewFile())
                     throw IOException("Failed to create file")
-                }
             }
         } catch (e: IOException) {
             throw FileNotFoundException("Couldn't create document '${newFile.path}': ${e.message}")
@@ -149,9 +142,8 @@ class DocumentProvider : DocumentsProvider() {
 
     override fun deleteDocument(documentId: String?) {
         val file = getFile(documentId!!)
-        if (!file.delete()) {
+        if (!file.delete())
             throw FileNotFoundException("Couldn't delete document with ID '$documentId'")
-        }
     }
 
     override fun removeDocument(documentId: String, parentDocumentId: String?) {
@@ -159,55 +151,38 @@ class DocumentProvider : DocumentsProvider() {
         val file = getFile(documentId)
 
         if (parent == file || file.parentFile == null || file.parentFile!! == parent) {
-            if (!file.delete()) {
+            if (!file.delete())
                 throw FileNotFoundException("Couldn't delete document with ID '$documentId'")
-            }
         } else {
             throw FileNotFoundException("Couldn't delete document with ID '$documentId'")
         }
     }
 
     override fun renameDocument(documentId: String?, displayName: String?): String {
-        if (displayName == null) {
-            throw FileNotFoundException(
-                "Couldn't rename document '$documentId' as the new name is null"
-            )
-        }
+        if (displayName == null)
+            throw FileNotFoundException("Couldn't rename document '$documentId' as the new name is null")
 
         val sourceFile = getFile(documentId!!)
         val sourceParentFile = sourceFile.parentFile
-            ?: throw FileNotFoundException(
-                "Couldn't rename document '$documentId' as it has no parent"
-            )
+            ?: throw FileNotFoundException("Couldn't rename document '$documentId' as it has no parent")
         val destFile = sourceParentFile.resolve(displayName)
 
         try {
-            if (!sourceFile.renameTo(destFile)) {
-                throw FileNotFoundException(
-                    "Couldn't rename document from '${sourceFile.name}' to '${destFile.name}'"
-                )
-            }
+            if (!sourceFile.renameTo(destFile))
+                throw FileNotFoundException("Couldn't rename document from '${sourceFile.name}' to '${destFile.name}'")
         } catch (e: Exception) {
-            throw FileNotFoundException(
-                "Couldn't rename document from '${sourceFile.name}' to '${destFile.name}': " +
-                    "${e.message}"
-            )
+            throw FileNotFoundException("Couldn't rename document from '${sourceFile.name}' to '${destFile.name}': ${e.message}")
         }
 
         return getDocumentId(destFile)
     }
 
     private fun copyDocument(
-        sourceDocumentId: String,
-        sourceParentDocumentId: String,
+        sourceDocumentId: String, sourceParentDocumentId: String,
         targetParentDocumentId: String?
     ): String {
-        if (!isChildDocument(sourceParentDocumentId, sourceDocumentId)) {
-            throw FileNotFoundException(
-                "Couldn't copy document '$sourceDocumentId' as its parent is not " +
-                    "'$sourceParentDocumentId'"
-            )
-        }
+        if (!isChildDocument(sourceParentDocumentId, sourceDocumentId))
+            throw FileNotFoundException("Couldn't copy document '$sourceDocumentId' as its parent is not '$sourceParentDocumentId'")
 
         return copyDocument(sourceDocumentId, targetParentDocumentId)
     }
@@ -218,13 +193,8 @@ class DocumentProvider : DocumentsProvider() {
         val newFile = parent.resolveWithoutConflict(oldFile.name)
 
         try {
-            if (!(
-                newFile.createNewFile() && newFile.setWritable(true) &&
-                    newFile.setReadable(true)
-                )
-            ) {
+            if (!(newFile.createNewFile() && newFile.setWritable(true) && newFile.setReadable(true)))
                 throw IOException("Couldn't create new file")
-            }
 
             FileInputStream(oldFile).use { inStream ->
                 FileOutputStream(newFile).use { outStream ->
@@ -239,14 +209,12 @@ class DocumentProvider : DocumentsProvider() {
     }
 
     override fun moveDocument(
-        sourceDocumentId: String,
-        sourceParentDocumentId: String?,
+        sourceDocumentId: String, sourceParentDocumentId: String?,
         targetParentDocumentId: String?
     ): String {
         try {
             val newDocumentId = copyDocument(
-                sourceDocumentId,
-                sourceParentDocumentId!!,
+                sourceDocumentId, sourceParentDocumentId!!,
                 targetParentDocumentId
             )
             removeDocument(sourceDocumentId, sourceParentDocumentId)
@@ -277,30 +245,24 @@ class DocumentProvider : DocumentsProvider() {
             add(DocumentsContract.Document.COLUMN_DOCUMENT_ID, localDocumentId)
             add(
                 DocumentsContract.Document.COLUMN_DISPLAY_NAME,
-                if (localFile == baseDirectory) {
-                    context!!.getString(R.string.app_name)
-                } else {
-                    localFile.name
-                }
+                if (localFile == baseDirectory) context!!.getString(R.string.app_name) else localFile.name
             )
             add(DocumentsContract.Document.COLUMN_SIZE, localFile.length())
             add(DocumentsContract.Document.COLUMN_MIME_TYPE, getTypeForFile(localFile))
             add(DocumentsContract.Document.COLUMN_LAST_MODIFIED, localFile.lastModified())
             add(DocumentsContract.Document.COLUMN_FLAGS, flags)
-            if (localFile == baseDirectory) {
+            if (localFile == baseDirectory)
                 add(DocumentsContract.Root.COLUMN_ICON, R.drawable.ic_yuzu)
-            }
         }
 
         return cursor
     }
 
     private fun getTypeForFile(file: File): Any {
-        return if (file.isDirectory) {
+        return if (file.isDirectory)
             DocumentsContract.Document.MIME_TYPE_DIR
-        } else {
+        else
             getTypeForName(file.name)
-        }
     }
 
     private fun getTypeForName(name: String): Any {
@@ -308,9 +270,8 @@ class DocumentProvider : DocumentsProvider() {
         if (lastDot >= 0) {
             val extension = name.substring(lastDot + 1)
             val mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
-            if (mime != null) {
+            if (mime != null)
                 return mime
-            }
         }
         return "application/octect-stream"
     }

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@@ -8,9 +8,6 @@ enum class BooleanSetting(
     override val section: String,
     override val defaultValue: Boolean
 ) : AbstractBooleanSetting {
-    CPU_DEBUG_MODE("cpu_debug_mode", Settings.SECTION_CPU, false),
-    FASTMEM("cpuopt_fastmem", Settings.SECTION_CPU, true),
-    FASTMEM_EXCLUSIVES("cpuopt_fastmem_exclusives", Settings.SECTION_CPU, true),
     PICTURE_IN_PICTURE("picture_in_picture", Settings.SECTION_GENERAL, true),
     USE_CUSTOM_RTC("custom_rtc_enabled", Settings.SECTION_SYSTEM, false);
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt

@@ -26,18 +26,13 @@ enum class IntSetting(
     RENDERER_FORCE_MAX_CLOCK(
         "force_max_clock",
         Settings.SECTION_RENDERER,
-        0
+        1
     ),
     RENDERER_ASYNCHRONOUS_SHADERS(
         "use_asynchronous_shaders",
         Settings.SECTION_RENDERER,
         0
     ),
-    RENDERER_REACTIVE_FLUSHING(
-        "use_reactive_flushing",
-        Settings.SECTION_RENDERER,
-        0
-    ),
     RENDERER_DEBUG(
         "debug",
         Settings.SECTION_RENDERER,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt

@@ -4,11 +4,11 @@
 package org.yuzu.yuzu_emu.features.settings.model
 
 import android.text.TextUtils
-import java.util.*
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsActivityView
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
+import java.util.*
 
 class Settings {
     private var gameId: String? = null
@@ -143,7 +143,11 @@ class Settings {
 
         private val configFileSectionsMap: MutableMap<String, List<String>> = HashMap()
 
-        const val LayoutOption_Unspecified = 0
+        // These must match what is defined in src/core/settings.h
+        const val LayoutOption_Default = 0
+        const val LayoutOption_SingleScreen = 1
+        const val LayoutOption_LargeScreen = 2
+        const val LayoutOption_SideScreen = 3
         const val LayoutOption_MobilePortrait = 4
         const val LayoutOption_MobileLandscape = 5
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/StringSetting.kt

@@ -8,7 +8,6 @@ enum class StringSetting(
     override val section: String,
     override val defaultValue: String
 ) : AbstractStringSetting {
-    AUDIO_OUTPUT_ENGINE("output_engine", Settings.SECTION_AUDIO, "auto"),
     CUSTOM_RTC("custom_rtc", Settings.SECTION_SYSTEM, "0");
 
     override var string: String = defaultValue

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/HeaderSetting.kt

@@ -3,8 +3,12 @@
 
 package org.yuzu.yuzu_emu.features.settings.model.view
 
+import org.yuzu.yuzu_emu.features.settings.model.AbstractSetting
+
 class HeaderSetting(
-    titleId: Int
-) : SettingsItem(null, titleId, 0) {
+    setting: AbstractSetting?,
+    titleId: Int,
+    descriptionId: Int
+) : SettingsItem(setting, titleId, descriptionId) {
     override val type = TYPE_HEADER
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SingleChoiceSetting.kt

@@ -4,6 +4,7 @@
 package org.yuzu.yuzu_emu.features.settings.model.view
 
 import org.yuzu.yuzu_emu.features.settings.model.AbstractIntSetting
+import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 
 class SingleChoiceSetting(
     setting: AbstractIntSetting?,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SliderSetting.kt

@@ -3,11 +3,13 @@
 
 package org.yuzu.yuzu_emu.features.settings.model.view
 
-import kotlin.math.roundToInt
 import org.yuzu.yuzu_emu.features.settings.model.AbstractFloatSetting
 import org.yuzu.yuzu_emu.features.settings.model.AbstractIntSetting
 import org.yuzu.yuzu_emu.features.settings.model.AbstractSetting
+import org.yuzu.yuzu_emu.features.settings.model.FloatSetting
+import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.utils.Log
+import kotlin.math.roundToInt
 
 class SliderSetting(
     setting: AbstractSetting?,
@@ -17,7 +19,7 @@ class SliderSetting(
     val max: Int,
     val units: String,
     val key: String? = null,
-    val defaultValue: Int? = null
+    val defaultValue: Int? = null,
 ) : SettingsItem(setting, titleId, descriptionId) {
     override val type = TYPE_SLIDER
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/StringSingleChoiceSetting.kt

@@ -5,25 +5,24 @@ package org.yuzu.yuzu_emu.features.settings.model.view
 
 import org.yuzu.yuzu_emu.features.settings.model.AbstractSetting
 import org.yuzu.yuzu_emu.features.settings.model.AbstractStringSetting
+import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 
 class StringSingleChoiceSetting(
+    val key: String? = null,
     setting: AbstractSetting?,
     titleId: Int,
     descriptionId: Int,
-    val choices: Array<String>,
-    val values: Array<String>?,
-    val key: String? = null,
+    val choicesId: Array<String>,
+    private val valuesId: Array<String>?,
     private val defaultValue: String? = null
 ) : SettingsItem(setting, titleId, descriptionId) {
     override val type = TYPE_STRING_SINGLE_CHOICE
 
     fun getValueAt(index: Int): String? {
-        if (values == null) return null
-        return if (index >= 0 && index < values.size) {
-            values[index]
-        } else {
-            ""
-        }
+        if (valuesId == null) return null
+        return if (index >= 0 && index < valuesId.size) {
+            valuesId[index]
+        } else ""
     }
 
     val selectedValue: String
@@ -36,8 +35,8 @@ class StringSingleChoiceSetting(
     val selectValueIndex: Int
         get() {
             val selectedValue = selectedValue
-            for (i in values!!.indices) {
-                if (values[i] == selectedValue) {
+            for (i in valuesId!!.indices) {
+                if (valuesId[i] == selectedValue) {
                     return i
                 }
             }

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SubmenuSetting.kt

@@ -3,6 +3,8 @@
 
 package org.yuzu.yuzu_emu.features.settings.model.view
 
+import org.yuzu.yuzu_emu.features.settings.model.AbstractSetting
+
 class SubmenuSetting(
     titleId: Int,
     descriptionId: Int,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt

@@ -8,18 +8,18 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.View
-import android.view.ViewGroup.MarginLayoutParams
 import android.widget.Toast
-import androidx.activity.OnBackPressedCallback
-import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
+import android.view.ViewGroup.MarginLayoutParams
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.result.ActivityResultLauncher
 import androidx.core.view.updatePadding
 import com.google.android.material.color.MaterialColors
-import java.io.IOException
+import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
 import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting
@@ -30,6 +30,7 @@ import org.yuzu.yuzu_emu.features.settings.model.SettingsViewModel
 import org.yuzu.yuzu_emu.features.settings.model.StringSetting
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.utils.*
+import java.io.IOException
 
 class SettingsActivity : AppCompatActivity(), SettingsActivityView {
     private val presenter = SettingsActivityPresenter(this)
@@ -59,9 +60,7 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
         setSupportActionBar(binding.toolbarSettings)
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
-        if (InsetsHelper.getSystemGestureType(applicationContext) !=
-            InsetsHelper.GESTURE_NAVIGATION
-        ) {
+        if (InsetsHelper.getSystemGestureType(applicationContext) != InsetsHelper.GESTURE_NAVIGATION) {
             binding.navigationBarShade.setBackgroundColor(
                 ThemeHelper.getColorWithOpacity(
                     MaterialColors.getColor(
@@ -77,8 +76,7 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
             this,
             object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() = navigateBack()
-            }
-        )
+            })
 
         setInsets()
     }
@@ -151,13 +149,11 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
     private fun areSystemAnimationsEnabled(): Boolean {
         val duration = android.provider.Settings.Global.getFloat(
             contentResolver,
-            android.provider.Settings.Global.ANIMATOR_DURATION_SCALE,
-            1f
+            android.provider.Settings.Global.ANIMATOR_DURATION_SCALE, 1f
         )
         val transition = android.provider.Settings.Global.getFloat(
             contentResolver,
-            android.provider.Settings.Global.TRANSITION_ANIMATION_SCALE,
-            1f
+            android.provider.Settings.Global.TRANSITION_ANIMATION_SCALE, 1f
         )
         return duration != 0f && transition != 0f
     }
@@ -212,9 +208,7 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
         get() = supportFragmentManager.findFragmentByTag(FRAGMENT_TAG) as SettingsFragment?
 
     private fun setInsets() {
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.frameContent
-        ) { view: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.frameContent) { view: View, windowInsets: WindowInsetsCompat ->
             val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
             view.updatePadding(
@@ -247,12 +241,7 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
             context.startActivity(settings)
         }
 
-        fun launch(
-            context: Context,
-            launcher: ActivityResultLauncher<Intent>,
-            menuTag: String?,
-            gameId: String?
-        ) {
+        fun launch(context: Context, launcher: ActivityResultLauncher<Intent>, menuTag: String?, gameId: String?) {
             val settings = Intent(context, SettingsActivity::class.java)
             settings.putExtra(ARG_MENU_TAG, menuTag)
             settings.putExtra(ARG_GAME_ID, gameId)

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivityPresenter.kt

@@ -6,12 +6,12 @@ package org.yuzu.yuzu_emu.features.settings.ui
 import android.content.Context
 import android.os.Bundle
 import android.text.TextUtils
-import java.io.File
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.Log
+import java.io.File
 
 class SettingsActivityPresenter(private val activityView: SettingsActivityView) {
     val settings: Settings get() = activityView.settings
@@ -46,15 +46,9 @@ class SettingsActivityPresenter(private val activityView: SettingsActivityView)
 
     private fun prepareDirectoriesIfNeeded() {
         val configFile =
-            File(
-                "${DirectoryInitialization.userDirectory}/config/" +
-                    "${SettingsFile.FILE_NAME_CONFIG}.ini"
-            )
+            File(DirectoryInitialization.userDirectory + "/config/" + SettingsFile.FILE_NAME_CONFIG + ".ini")
         if (!configFile.exists()) {
-            Log.error(
-                "${DirectoryInitialization.userDirectory}/config/" +
-                    "${SettingsFile.FILE_NAME_CONFIG}.ini"
-            )
+            Log.error(DirectoryInitialization.userDirectory + "/config/" + SettingsFile.FILE_NAME_CONFIG + ".ini")
             Log.error("yuzu config file could not be found!")
         }
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt

@@ -13,6 +13,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.setFragmentResultListener
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -138,7 +139,7 @@ class SettingsAdapter(
         clickedItem = item
         dialog = MaterialAlertDialogBuilder(context)
             .setTitle(item.nameId)
-            .setSingleChoiceItems(item.choices, item.selectValueIndex, this)
+            .setSingleChoiceItems(item.choicesId, item.selectValueIndex, this)
             .show()
     }
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragment.kt

@@ -50,10 +50,7 @@ class SettingsFragment : Fragment(), SettingsFragmentView {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         settingsAdapter = SettingsAdapter(this, requireActivity())
-        val dividerDecoration = MaterialDividerItemDecoration(
-            requireContext(),
-            LinearLayoutManager.VERTICAL
-        )
+        val dividerDecoration = MaterialDividerItemDecoration(requireContext(), LinearLayoutManager.VERTICAL)
         dividerDecoration.isLastItemDecorated = false
         binding.listSettings.apply {
             adapter = settingsAdapter
@@ -102,9 +99,7 @@ class SettingsFragment : Fragment(), SettingsFragmentView {
     }
 
     private fun setInsets() {
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.listSettings
-        ) { view: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.listSettings) { view: View, windowInsets: WindowInsetsCompat ->
             val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             view.updatePadding(bottom = insets.bottom)
             windowInsets

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -7,6 +7,7 @@ import android.content.SharedPreferences
 import android.os.Build
 import android.text.TextUtils
 import androidx.preference.PreferenceManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.features.settings.model.AbstractBooleanSetting
@@ -42,7 +43,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
     }
 
     fun putSetting(setting: AbstractSetting) {
-        if (setting.section == null || setting.key == null) {
+        if (setting.section == null) {
             return
         }
 
@@ -235,6 +236,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
     private fun addGraphicsSettings(sl: ArrayList<SettingsItem>) {
         settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.preferences_graphics))
         sl.apply {
+
             add(
                 SingleChoiceSetting(
                     IntSetting.RENDERER_ACCURACY,
@@ -339,45 +341,23 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.RENDERER_ASYNCHRONOUS_SHADERS.defaultValue
                 )
             )
-            add(
-                SwitchSetting(
-                    IntSetting.RENDERER_REACTIVE_FLUSHING,
-                    R.string.renderer_reactive_flushing,
-                    R.string.renderer_reactive_flushing_description,
-                    IntSetting.RENDERER_REACTIVE_FLUSHING.key,
-                    IntSetting.RENDERER_REACTIVE_FLUSHING.defaultValue
-                )
-            )
         }
     }
 
     private fun addAudioSettings(sl: ArrayList<SettingsItem>) {
         settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.preferences_audio))
-        sl.apply {
-            add(
-                StringSingleChoiceSetting(
-                    StringSetting.AUDIO_OUTPUT_ENGINE,
-                    R.string.audio_output_engine,
-                    0,
-                    settingsActivity.resources.getStringArray(R.array.outputEngineEntries),
-                    settingsActivity.resources.getStringArray(R.array.outputEngineValues),
-                    StringSetting.AUDIO_OUTPUT_ENGINE.key,
-                    StringSetting.AUDIO_OUTPUT_ENGINE.defaultValue
-                )
+        sl.add(
+            SliderSetting(
+                IntSetting.AUDIO_VOLUME,
+                R.string.audio_volume,
+                R.string.audio_volume_description,
+                0,
+                100,
+                "%",
+                IntSetting.AUDIO_VOLUME.key,
+                IntSetting.AUDIO_VOLUME.defaultValue
             )
-            add(
-                SliderSetting(
-                    IntSetting.AUDIO_VOLUME,
-                    R.string.audio_volume,
-                    R.string.audio_volume_description,
-                    0,
-                    100,
-                    "%",
-                    IntSetting.AUDIO_VOLUME.key,
-                    IntSetting.AUDIO_VOLUME.defaultValue
-                )
-            )
-        }
+        )
     }
 
     private fun addThemeSettings(sl: ArrayList<SettingsItem>) {
@@ -480,7 +460,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
     private fun addDebugSettings(sl: ArrayList<SettingsItem>) {
         settingsActivity.setToolbarTitle(settingsActivity.getString(R.string.preferences_debug))
         sl.apply {
-            add(HeaderSetting(R.string.gpu))
             add(
                 SingleChoiceSetting(
                     IntSetting.RENDERER_BACKEND,
@@ -501,39 +480,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.RENDERER_DEBUG.defaultValue
                 )
             )
-
-            add(HeaderSetting(R.string.cpu))
-            add(
-                SwitchSetting(
-                    BooleanSetting.CPU_DEBUG_MODE,
-                    R.string.cpu_debug_mode,
-                    R.string.cpu_debug_mode_description,
-                    BooleanSetting.CPU_DEBUG_MODE.key,
-                    BooleanSetting.CPU_DEBUG_MODE.defaultValue
-                )
-            )
-
-            val fastmem = object : AbstractBooleanSetting {
-                override var boolean: Boolean
-                    get() =
-                        BooleanSetting.FASTMEM.boolean && BooleanSetting.FASTMEM_EXCLUSIVES.boolean
-                    set(value) {
-                        BooleanSetting.FASTMEM.boolean = value
-                        BooleanSetting.FASTMEM_EXCLUSIVES.boolean = value
-                    }
-                override val key: String? = null
-                override val section: String = Settings.SECTION_CPU
-                override val isRuntimeEditable: Boolean = false
-                override val valueAsString: String = ""
-                override val defaultValue: Any = true
-            }
-            add(
-                SwitchSetting(
-                    fastmem,
-                    R.string.fastmem,
-                    0
-                )
-            )
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/DateTimeViewHolder.kt

@@ -4,15 +4,15 @@
 package org.yuzu.yuzu_emu.features.settings.ui.viewholder
 
 import android.view.View
+import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding
+import org.yuzu.yuzu_emu.features.settings.model.view.DateTimeSetting
+import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
+import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
 import java.time.Instant
 import java.time.ZoneId
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
-import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding
-import org.yuzu.yuzu_emu.features.settings.model.view.DateTimeSetting
-import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
-import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
 
 class DateTimeViewHolder(val binding: ListItemSettingBinding, adapter: SettingsAdapter) :
     SettingViewHolder(binding.root, adapter) {

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.kt

@@ -26,14 +26,6 @@ class SingleChoiceViewHolder(val binding: ListItemSettingBinding, adapter: Setti
             for (i in values.indices) {
                 if (values[i] == item.selectedValue) {
                     binding.textSettingDescription.text = resMgr.getStringArray(item.choicesId)[i]
-                    return
-                }
-            }
-        } else if (item is StringSingleChoiceSetting) {
-            for (i in item.values!!.indices) {
-                if (item.values[i] == item.selectedValue) {
-                    binding.textSettingDescription.text = item.choices[i]
-                    return
                 }
             }
         } else {

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/SwitchSettingViewHolder.kt

@@ -6,8 +6,8 @@ package org.yuzu.yuzu_emu.features.settings.ui.viewholder
 import android.view.View
 import android.widget.CompoundButton
 import org.yuzu.yuzu_emu.databinding.ListItemSettingSwitchBinding
-import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.model.view.SwitchSetting
+import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsAdapter
 
 class SwitchSettingViewHolder(val binding: ListItemSettingSwitchBinding, adapter: SettingsAdapter) :

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.kt

@@ -3,8 +3,6 @@
 
 package org.yuzu.yuzu_emu.features.settings.utils
 
-import java.io.*
-import java.util.*
 import org.ini4j.Wini
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
@@ -15,6 +13,8 @@ import org.yuzu.yuzu_emu.features.settings.ui.SettingsActivityView
 import org.yuzu.yuzu_emu.utils.BiMap
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.Log
+import java.io.*
+import java.util.*
 
 /**
  * Contains static methods for interacting with .ini files in which settings are stored.
@@ -137,12 +137,9 @@ object SettingsFile {
             for (settingKey in sortedKeySet) {
                 val setting = settings[settingKey]
                 NativeLibrary.setUserSetting(
-                    gameId,
-                    mapSectionNameFromIni(
+                    gameId, mapSectionNameFromIni(
                         section.name
-                    ),
-                    setting!!.key,
-                    setting.valueAsString
+                    ), setting!!.key, setting.valueAsString
                 )
             }
         }
@@ -151,17 +148,13 @@ object SettingsFile {
     private fun mapSectionNameFromIni(generalSectionName: String): String? {
         return if (sectionsMap.getForward(generalSectionName) != null) {
             sectionsMap.getForward(generalSectionName)
-        } else {
-            generalSectionName
-        }
+        } else generalSectionName
     }
 
     private fun mapSectionNameToIni(generalSectionName: String): String {
         return if (sectionsMap.getBackward(generalSectionName) != null) {
             sectionsMap.getBackward(generalSectionName).toString()
-        } else {
-            generalSectionName
-        }
+        } else generalSectionName
     }
 
     fun getSettingsFile(fileName: String): File {
@@ -244,21 +237,5 @@ object SettingsFile {
             val setting = settings[key]
             parser.put(header, setting!!.key, setting.valueAsString)
         }
-
-        BooleanSetting.values().forEach {
-            if (!keySet.contains(it.key)) {
-                parser.put(header, it.key, it.valueAsString)
-            }
-        }
-        IntSetting.values().forEach {
-            if (!keySet.contains(it.key)) {
-                parser.put(header, it.key, it.valueAsString)
-            }
-        }
-        StringSetting.values().forEach {
-            if (!keySet.contains(it.key)) {
-                parser.put(header, it.key, it.valueAsString)
-            }
-        }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AboutFragment.kt

@@ -66,11 +66,7 @@ class AboutFragment : Fragment() {
             true
         }
 
-        binding.buttonContributors.setOnClickListener {
-            openLink(
-                getString(R.string.contributors_link)
-            )
-        }
+        binding.buttonContributors.setOnClickListener { openLink(getString(R.string.contributors_link)) }
         binding.buttonLicenses.setOnClickListener {
             exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
             binding.root.findNavController().navigate(R.id.action_aboutFragment_to_licensesFragment)
@@ -105,9 +101,7 @@ class AboutFragment : Fragment() {
     }
 
     private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { _: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _: View, windowInsets: WindowInsetsCompat ->
             val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EarlyAccessFragment.kt

@@ -49,11 +49,7 @@ class EarlyAccessFragment : Fragment() {
             parentFragmentManager.primaryNavigationFragment?.findNavController()?.popBackStack()
         }
 
-        binding.getEarlyAccessButton.setOnClickListener {
-            openLink(
-                getString(R.string.play_store_link)
-            )
-        }
+        binding.getEarlyAccessButton.setOnClickListener { openLink(getString(R.string.play_store_link)) }
 
         setInsets()
     }
@@ -64,9 +60,7 @@ class EarlyAccessFragment : Fragment() {
     }
 
     private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { _: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _: View, windowInsets: WindowInsetsCompat ->
             val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt

@@ -11,35 +11,32 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
+import android.content.res.Resources
 import android.graphics.Color
+import android.hardware.display.DisplayManager
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
-import android.util.Rational
+import android.util.TypedValue
 import android.view.*
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.PopupMenu
+import androidx.core.content.getSystemService
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.Insets
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.navigation.fragment.navArgs
 import androidx.preference.PreferenceManager
 import androidx.window.layout.FoldingFeature
-import androidx.window.layout.WindowInfoTracker
 import androidx.window.layout.WindowLayoutInfo
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
@@ -50,8 +47,9 @@ import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsActivity
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
-import org.yuzu.yuzu_emu.overlay.InputOverlay
+import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.utils.*
+import org.yuzu.yuzu_emu.utils.SerializableHelper.parcelable
 
 class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     private lateinit var preferences: SharedPreferences
@@ -62,9 +60,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     private var _binding: FragmentEmulationBinding? = null
     private val binding get() = _binding!!
 
-    val args by navArgs<EmulationFragmentArgs>()
-
-    private var isInFoldableLayout = false
+    private lateinit var game: Game
 
     private lateinit var onReturnFromSettings: ActivityResultLauncher<Intent>
 
@@ -74,18 +70,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             emulationActivity = context
             NativeLibrary.setEmulationActivity(context)
 
-            lifecycleScope.launch(Dispatchers.Main) {
-                lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                    WindowInfoTracker.getOrCreate(context)
-                        .windowLayoutInfo(context)
-                        .collect { updateFoldableLayout(context, it) }
-                }
-            }
-
             onReturnFromSettings = context.activityResultRegistry.register(
-                "SettingsResult",
-                ActivityResultContracts.StartActivityForResult()
-            ) { updateScreenLayout() }
+                "SettingsResult", ActivityResultContracts.StartActivityForResult()
+            ) {
+                updateScreenLayout()
+            }
         } else {
             throw IllegalStateException("EmulationFragment must have EmulationActivity parent")
         }
@@ -100,7 +89,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         // So this fragment doesn't restart on configuration changes; i.e. rotation.
         retainInstance = true
         preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
-        emulationState = EmulationState(args.game.path)
+        game = requireArguments().parcelable(EmulationActivity.EXTRA_SELECTED_GAME)!!
+        emulationState = EmulationState(game.path)
     }
 
     /**
@@ -124,7 +114,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         updateShowFpsOverlay()
 
         binding.inGameMenu.getHeaderView(0).findViewById<TextView>(R.id.text_game_title).text =
-            args.game.title
+            game.title
         binding.inGameMenu.setNavigationItemSelectedListener {
             when (it.itemId) {
                 R.id.menu_pause_emulation -> {
@@ -150,10 +140,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
                 R.id.menu_settings -> {
                     SettingsActivity.launch(
-                        requireContext(),
-                        onReturnFromSettings,
-                        SettingsFile.FILE_NAME_CONFIG,
-                        ""
+                        requireContext(), onReturnFromSettings, SettingsFile.FILE_NAME_CONFIG, ""
                     )
                     true
                 }
@@ -179,48 +166,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             requireActivity(),
             object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() {
-                    if (binding.drawerLayout.isOpen) {
-                        binding.drawerLayout.close()
-                    } else {
-                        binding.drawerLayout.open()
-                    }
+                    if (binding.drawerLayout.isOpen) binding.drawerLayout.close() else binding.drawerLayout.open()
                 }
-            }
-        )
-
-        viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Main) {
-            lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                WindowInfoTracker.getOrCreate(requireContext())
-                    .windowLayoutInfo(requireActivity())
-                    .collect { updateFoldableLayout(requireActivity() as EmulationActivity, it) }
-            }
-        }
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        if (emulationActivity?.isInPictureInPictureMode == true) {
-            if (binding.drawerLayout.isOpen) {
-                binding.drawerLayout.close()
-            }
-            if (EmulationMenuSettings.showOverlay) {
-                binding.surfaceInputOverlay.post { binding.surfaceInputOverlay.isVisible = false }
-            }
-        } else {
-            if (EmulationMenuSettings.showOverlay) {
-                binding.surfaceInputOverlay.post { binding.surfaceInputOverlay.isVisible = true }
-            }
-            if (!isInFoldableLayout) {
-                if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
-                    binding.surfaceInputOverlay.orientation = InputOverlay.PORTRAIT
-                } else {
-                    binding.surfaceInputOverlay.orientation = InputOverlay.LANDSCAPE
-                }
-            }
-            if (!binding.surfaceInputOverlay.isInEditMode) {
-                refreshInputOverlay()
-            }
-        }
+            })
     }
 
     override fun onResume() {
@@ -228,9 +176,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         if (!DirectoryInitialization.areDirectoriesReady) {
             DirectoryInitialization.start(requireContext())
         }
-
-        updateScreenLayout()
-
         emulationState.run(emulationActivity!!.isActivityRecreated)
     }
 
@@ -251,6 +196,93 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         super.onDetach()
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+
+        val emulatorLayout = when (newConfig.orientation) {
+            Configuration.ORIENTATION_LANDSCAPE -> { Settings.LayoutOption_MobileLandscape }
+            Configuration.ORIENTATION_PORTRAIT -> { Settings.LayoutOption_MobilePortrait }
+            else -> { Settings.LayoutOption_MobilePortrait }
+        }
+
+        emulationActivity?.let {
+            var rotation = it.getSystemService<DisplayManager>()!!
+                .getDisplay(Display.DEFAULT_DISPLAY).rotation
+            if (it.isInPictureInPictureMode) {
+                NativeLibrary.notifyOrientationChange(
+                    Settings.LayoutOption_MobileLandscape,
+                    Surface.ROTATION_90
+                )
+            } else {
+                if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
+                    rotation = when (rotation) {
+                        Surface.ROTATION_0 -> Surface.ROTATION_90
+                        Surface.ROTATION_90 -> Surface.ROTATION_0
+                        Surface.ROTATION_180 -> Surface.ROTATION_270
+                        Surface.ROTATION_270 -> Surface.ROTATION_180
+                        else -> { rotation }
+                    }
+                }
+                getScaledOrDefaultView(newConfig)
+                NativeLibrary.notifyOrientationChange(emulatorLayout, rotation)
+            }
+        }
+    }
+
+    private fun getScaledOrDefaultView(config: Configuration?) {
+        emulationActivity?.let {
+            val orientation = config?.orientation ?: resources.configuration.orientation
+            if (orientation == Configuration.ORIENTATION_PORTRAIT && !it.isInPictureInPictureMode) {
+                if (it.screenDimensions.isNotEmpty()) {
+                    binding.surfaceEmulation.layoutParams.width = it.screenDimensions[0]
+                    binding.overlayContainer.layoutParams.width = it.screenDimensions[0]
+                    binding.surfaceEmulation.layoutParams.height = it.screenDimensions[1]
+                    binding.overlayContainer.layoutParams.height = it.screenDimensions[1]
+                }
+            } else {
+                binding.surfaceEmulation.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+                binding.overlayContainer.layoutParams.width = ViewGroup.LayoutParams.MATCH_PARENT
+                binding.surfaceEmulation.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+                binding.overlayContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            }
+            binding.surfaceEmulation.requestLayout()
+            binding.overlayContainer.requestLayout()
+        }
+    }
+
+    fun isEmulationStatePaused() : Boolean {
+        return this::emulationState.isInitialized && emulationState.isPaused
+    }
+
+    fun onPictureInPictureEnter() {
+        getScaledOrDefaultView(null)
+        if (binding.drawerLayout.isOpen) {
+            binding.drawerLayout.close()
+        }
+        if (EmulationMenuSettings.showOverlay) {
+            binding.surfaceInputOverlay.post { binding.surfaceInputOverlay.isVisible = false }
+        }
+    }
+
+    fun onPictureInPicturePause() {
+        if (!emulationState.isPaused) {
+            emulationState.pause()
+        }
+    }
+
+    fun onPictureInPicturePlay() {
+        if (emulationState.isPaused) {
+            emulationState.run(false)
+        }
+    }
+
+    fun onPictureInPictureLeave() {
+        if (EmulationMenuSettings.showOverlay) {
+            binding.surfaceInputOverlay.post { binding.surfaceInputOverlay.isVisible = true }
+        }
+        getScaledOrDefaultView(null)
+    }
+
     private fun refreshInputOverlay() {
         binding.surfaceInputOverlay.refreshControls()
     }
@@ -291,71 +323,49 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     }
 
     @SuppressLint("SourceLockedOrientationActivity")
-    private fun updateOrientation() {
-        emulationActivity?.let {
-            it.requestedOrientation = when (IntSetting.RENDERER_SCREEN_LAYOUT.int) {
-                Settings.LayoutOption_MobileLandscape ->
-                    ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
-                Settings.LayoutOption_MobilePortrait ->
-                    ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
-                Settings.LayoutOption_Unspecified -> ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-                else -> ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
-            }
-        }
-    }
-
     private fun updateScreenLayout() {
-        binding.surfaceEmulation.setAspectRatio(
-            when (IntSetting.RENDERER_ASPECT_RATIO.int) {
-                0 -> Rational(16, 9)
-                1 -> Rational(4, 3)
-                2 -> Rational(21, 9)
-                3 -> Rational(16, 10)
-                4 -> null // Stretch
-                else -> Rational(16, 9)
-            }
-        )
-        emulationActivity?.buildPictureInPictureParams()
-        updateOrientation()
-    }
-
-    private fun updateFoldableLayout(
-        emulationActivity: EmulationActivity,
-        newLayoutInfo: WindowLayoutInfo
-    ) {
-        val isFolding =
-            (newLayoutInfo.displayFeatures.find { it is FoldingFeature } as? FoldingFeature)?.let {
-                if (it.isSeparating) {
-                    emulationActivity.requestedOrientation =
-                        ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-                    if (it.orientation == FoldingFeature.Orientation.HORIZONTAL) {
-                        // Restrict emulation and overlays to the top of the screen
-                        binding.emulationContainer.layoutParams.height = it.bounds.top
-                        binding.overlayContainer.layoutParams.height = it.bounds.top
-                        // Restrict input and menu drawer to the bottom of the screen
-                        binding.inputContainer.layoutParams.height = it.bounds.bottom
-                        binding.inGameMenu.layoutParams.height = it.bounds.bottom
-
-                        isInFoldableLayout = true
-                        binding.surfaceInputOverlay.orientation = InputOverlay.FOLDABLE
-                        refreshInputOverlay()
-                    }
+        emulationActivity?.let {
+            when (IntSetting.RENDERER_SCREEN_LAYOUT.int) {
+                Settings.LayoutOption_MobileLandscape -> {
+                    it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
                 }
-                it.isSeparating
-            } ?: false
-        if (!isFolding) {
-            binding.emulationContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
-            binding.inputContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
-            binding.overlayContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
-            binding.inGameMenu.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
-            isInFoldableLayout = false
-            updateOrientation()
+                Settings.LayoutOption_MobilePortrait -> {
+                    it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
+                }
+                Settings.LayoutOption_Default -> {
+                    it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+                }
+                else -> { it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE }
+            }
             onConfigurationChanged(resources.configuration)
         }
-        binding.emulationContainer.requestLayout()
-        binding.inputContainer.requestLayout()
-        binding.overlayContainer.requestLayout()
+    }
+
+    private val Number.toPx get() = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), Resources.getSystem().displayMetrics).toInt()
+
+    fun updateFoldableLayout(emulationActivity: EmulationActivity, newLayoutInfo: WindowLayoutInfo) {
+        val isFolding = (newLayoutInfo.displayFeatures.find { it is FoldingFeature } as? FoldingFeature)?.let {
+            if (it.isSeparating) {
+                emulationActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+                if (it.orientation == FoldingFeature.Orientation.HORIZONTAL) {
+                    binding.surfaceEmulation.layoutParams.height = it.bounds.top
+                    binding.inGameMenu.layoutParams.height = it.bounds.bottom
+                    binding.overlayContainer.layoutParams.height = it.bounds.bottom - 48.toPx
+                    binding.overlayContainer.updatePadding(0, 0, 0, 24.toPx)
+                }
+            }
+            it.isSeparating
+        } ?: false
+        if (!isFolding) {
+            binding.surfaceEmulation.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            binding.inGameMenu.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            binding.overlayContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            binding.overlayContainer.updatePadding(0, 0, 0, 0)
+            updateScreenLayout()
+        }
+        binding.surfaceEmulation.requestLayout()
         binding.inGameMenu.requestLayout()
+        binding.overlayContainer.requestLayout()
     }
 
     override fun surfaceCreated(holder: SurfaceHolder) {
@@ -485,19 +495,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         popup.show()
     }
 
-    @SuppressLint("SourceLockedOrientationActivity")
     private fun startConfiguringControls() {
-        // Lock the current orientation to prevent editing inconsistencies
-        if (IntSetting.RENDERER_SCREEN_LAYOUT.int == Settings.LayoutOption_Unspecified) {
-            emulationActivity?.let {
-                it.requestedOrientation =
-                    if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
-                        ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT
-                    } else {
-                        ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE
-                    }
-            }
-        }
         binding.doneControlConfig.visibility = View.VISIBLE
         binding.surfaceInputOverlay.setIsInEditMode(true)
     }
@@ -505,12 +503,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     private fun stopConfiguringControls() {
         binding.doneControlConfig.visibility = View.GONE
         binding.surfaceInputOverlay.setIsInEditMode(false)
-        // Unlock the orientation if it was locked for editing
-        if (IntSetting.RENDERER_SCREEN_LAYOUT.int == Settings.LayoutOption_Unspecified) {
-            emulationActivity?.let {
-                it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
-            }
-        }
     }
 
     @SuppressLint("SetTextI18n")
@@ -520,22 +512,18 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             inputScaleSlider.apply {
                 valueTo = 150F
                 value = preferences.getInt(Settings.PREF_CONTROL_SCALE, 50).toFloat()
-                addOnChangeListener(
-                    Slider.OnChangeListener { _, value, _ ->
-                        inputScaleValue.text = "${value.toInt()}%"
-                        setControlScale(value.toInt())
-                    }
-                )
+                addOnChangeListener(Slider.OnChangeListener { _, value, _ ->
+                    inputScaleValue.text = "${value.toInt()}%"
+                    setControlScale(value.toInt())
+                })
             }
             inputOpacitySlider.apply {
                 valueTo = 100F
                 value = preferences.getInt(Settings.PREF_CONTROL_OPACITY, 100).toFloat()
-                addOnChangeListener(
-                    Slider.OnChangeListener { _, value, _ ->
-                        inputOpacityValue.text = "${value.toInt()}%"
-                        setControlOpacity(value.toInt())
-                    }
-                )
+                addOnChangeListener(Slider.OnChangeListener { _, value, _ ->
+                    inputOpacityValue.text = "${value.toInt()}%"
+                    setControlOpacity(value.toInt())
+                })
             }
             inputScaleValue.text = "${inputScaleSlider.value.toInt()}%"
             inputOpacityValue.text = "${inputOpacitySlider.value.toInt()}%"
@@ -567,9 +555,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     }
 
     private fun setInsets() {
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.inGameMenu
-        ) { v: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.inGameMenu) { v: View, windowInsets: WindowInsetsCompat ->
             val cutInsets: Insets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
             var left = 0
             var right = 0
@@ -689,12 +675,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         state = State.PAUSED
                     }
 
-                    State.PAUSED -> Log.warning(
-                        "[EmulationFragment] Surface cleared while emulation paused."
-                    )
-                    else -> Log.warning(
-                        "[EmulationFragment] Surface cleared while emulation stopped."
-                    )
+                    State.PAUSED -> Log.warning("[EmulationFragment] Surface cleared while emulation paused.")
+                    else -> Log.warning("[EmulationFragment] Surface cleared while emulation stopped.")
                 }
             }
         }
@@ -714,7 +696,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 State.PAUSED -> {
                     Log.debug("[EmulationFragment] Resuming emulation.")
                     NativeLibrary.surfaceChanged(surface)
-                    NativeLibrary.unpauseEmulation()
+                    NativeLibrary.unPauseEmulation()
                 }
 
                 else -> Log.debug("[EmulationFragment] Bug, run called while already running.")
@@ -729,5 +711,13 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
     companion object {
         private val perfStatsUpdateHandler = Handler(Looper.myLooper()!!)
+
+        fun newInstance(game: Game): EmulationFragment {
+            val args = Bundle()
+            args.putParcelable(EmulationActivity.EXTRA_SELECTED_GAME, game)
+            val fragment = EmulationFragment()
+            fragment.arguments = args
+            return fragment
+        }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt

@@ -68,109 +68,67 @@ class HomeSettingsFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         mainActivity = requireActivity() as MainActivity
 
-        val optionsList: MutableList<HomeSetting> = mutableListOf<HomeSetting>().apply {
-            add(
-                HomeSetting(
-                    R.string.advanced_settings,
-                    R.string.settings_description,
-                    R.drawable.ic_settings
-                ) { SettingsActivity.launch(requireContext(), SettingsFile.FILE_NAME_CONFIG, "") }
-            )
-            add(
-                HomeSetting(
-                    R.string.open_user_folder,
-                    R.string.open_user_folder_description,
-                    R.drawable.ic_folder_open
-                ) { openFileManager() }
-            )
-            add(
-                HomeSetting(
-                    R.string.preferences_theme,
-                    R.string.theme_and_color_description,
-                    R.drawable.ic_palette
-                ) { SettingsActivity.launch(requireContext(), Settings.SECTION_THEME, "") }
-            )
-
-            if (GpuDriverHelper.supportsCustomDriverLoading()) {
-                add(
-                    HomeSetting(
-                        R.string.install_gpu_driver,
-                        R.string.install_gpu_driver_description,
-                        R.drawable.ic_exit
-                    ) { driverInstaller() }
-                )
+        val optionsList: MutableList<HomeSetting> = mutableListOf(
+            HomeSetting(
+                R.string.advanced_settings,
+                R.string.settings_description,
+                R.drawable.ic_settings
+            ) { SettingsActivity.launch(requireContext(), SettingsFile.FILE_NAME_CONFIG, "") },
+            HomeSetting(
+                R.string.open_user_folder,
+                R.string.open_user_folder_description,
+                R.drawable.ic_folder_open
+            ) { openFileManager() },
+            HomeSetting(
+                R.string.preferences_theme,
+                R.string.theme_and_color_description,
+                R.drawable.ic_palette
+            ) { SettingsActivity.launch(requireContext(), Settings.SECTION_THEME, "") },
+            HomeSetting(
+                R.string.install_gpu_driver,
+                R.string.install_gpu_driver_description,
+                R.drawable.ic_exit
+            ) { driverInstaller() },
+            HomeSetting(
+                R.string.install_amiibo_keys,
+                R.string.install_amiibo_keys_description,
+                R.drawable.ic_nfc
+            ) { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) },
+            HomeSetting(
+                R.string.select_games_folder,
+                R.string.select_games_folder_description,
+                R.drawable.ic_add
+            ) { mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data) },
+            HomeSetting(
+                R.string.manage_save_data,
+                R.string.import_export_saves_description,
+                R.drawable.ic_save
+            ) { ImportExportSavesFragment().show(parentFragmentManager, ImportExportSavesFragment.TAG) },
+            HomeSetting(
+                R.string.install_prod_keys,
+                R.string.install_prod_keys_description,
+                R.drawable.ic_unlock
+            ) { mainActivity.getProdKey.launch(arrayOf("*/*")) },
+            HomeSetting(
+                R.string.install_firmware,
+                R.string.install_firmware_description,
+                R.drawable.ic_firmware
+            ) { mainActivity.getFirmware.launch(arrayOf("application/zip")) },
+            HomeSetting(
+                R.string.share_log,
+                R.string.share_log_description,
+                R.drawable.ic_log
+            ) { shareLog() },
+            HomeSetting(
+                R.string.about,
+                R.string.about_description,
+                R.drawable.ic_info_outline
+            ) {
+                exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
+                parentFragmentManager.primaryNavigationFragment?.findNavController()
+                    ?.navigate(R.id.action_homeSettingsFragment_to_aboutFragment)
             }
-
-            add(
-                HomeSetting(
-                    R.string.install_amiibo_keys,
-                    R.string.install_amiibo_keys_description,
-                    R.drawable.ic_nfc
-                ) { mainActivity.getAmiiboKey.launch(arrayOf("*/*")) }
-            )
-            add(
-                HomeSetting(
-                    R.string.install_game_content,
-                    R.string.install_game_content_description,
-                    R.drawable.ic_system_update_alt
-                ) { mainActivity.installGameUpdate.launch(arrayOf("*/*")) }
-            )
-            add(
-                HomeSetting(
-                    R.string.select_games_folder,
-                    R.string.select_games_folder_description,
-                    R.drawable.ic_add
-                ) {
-                    mainActivity.getGamesDirectory.launch(
-                        Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data
-                    )
-                }
-            )
-            add(
-                HomeSetting(
-                    R.string.manage_save_data,
-                    R.string.import_export_saves_description,
-                    R.drawable.ic_save
-                ) {
-                    ImportExportSavesFragment().show(
-                        parentFragmentManager,
-                        ImportExportSavesFragment.TAG
-                    )
-                }
-            )
-            add(
-                HomeSetting(
-                    R.string.install_prod_keys,
-                    R.string.install_prod_keys_description,
-                    R.drawable.ic_unlock
-                ) { mainActivity.getProdKey.launch(arrayOf("*/*")) }
-            )
-            add(
-                HomeSetting(
-                    R.string.install_firmware,
-                    R.string.install_firmware_description,
-                    R.drawable.ic_firmware
-                ) { mainActivity.getFirmware.launch(arrayOf("application/zip")) }
-            )
-            add(
-                HomeSetting(
-                    R.string.share_log,
-                    R.string.share_log_description,
-                    R.drawable.ic_log
-                ) { shareLog() }
-            )
-            add(
-                HomeSetting(
-                    R.string.about,
-                    R.string.about_description,
-                    R.drawable.ic_info_outline
-                ) {
-                    exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-                    parentFragmentManager.primaryNavigationFragment?.findNavController()
-                        ?.navigate(R.id.action_homeSettingsFragment_to_aboutFragment)
-                }
-            )
-        }
+        )
 
         if (!BuildConfig.PREMIUM) {
             optionsList.add(
@@ -257,11 +215,7 @@ class HomeSettingsFragment : Fragment() {
         val intent = Intent(action)
         intent.addCategory(Intent.CATEGORY_DEFAULT)
         intent.data = DocumentsContract.buildRootUri(authority, DocumentProvider.ROOT_ID)
-        intent.addFlags(
-            Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or
-                Intent.FLAG_GRANT_PREFIX_URI_PERMISSION or
-                Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-        )
+        intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION or Intent.FLAG_GRANT_PREFIX_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
         return intent
     }
 
@@ -343,9 +297,7 @@ class HomeSettingsFragment : Fragment() {
     }
 
     private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { view: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view: View, windowInsets: WindowInsetsCompat ->
             val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
             val spacingNavigation = resources.getDimensionPixelSize(R.dimen.spacing_navigation)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/ImportExportSavesFragment.kt

@@ -15,14 +15,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.documentfile.provider.DocumentFile
 import androidx.fragment.app.DialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.BufferedOutputStream
-import java.io.File
-import java.io.FileOutputStream
-import java.io.FilenameFilter
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-import java.util.zip.ZipEntry
-import java.util.zip.ZipOutputStream
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -32,6 +24,14 @@ import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.features.DocumentProvider
 import org.yuzu.yuzu_emu.getPublicFilesDir
 import org.yuzu.yuzu_emu.utils.FileUtil
+import java.io.BufferedOutputStream
+import java.io.File
+import java.io.FileOutputStream
+import java.io.FilenameFilter
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import java.util.zip.ZipEntry
+import java.util.zip.ZipOutputStream
 
 class ImportExportSavesFragment : DialogFragment() {
     private val context = YuzuApplication.appContext
@@ -98,7 +98,7 @@ class ImportExportSavesFragment : DialogFragment() {
             val outputZipFile = File(
                 tempFolder,
                 "yuzu saves - ${
-                LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
+                    LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))
                 }.zip"
             )
             outputZipFile.createNewFile()
@@ -106,14 +106,12 @@ class ImportExportSavesFragment : DialogFragment() {
                 saveFolder.walkTopDown().forEach { file ->
                     val zipFileName =
                         file.absolutePath.removePrefix(savesFolderRoot).removePrefix("/")
-                    if (zipFileName == "") {
+                    if (zipFileName == "")
                         return@forEach
-                    }
                     val entry = ZipEntry("$zipFileName${(if (file.isDirectory) "/" else "")}")
                     zos.putNextEntry(entry)
-                    if (file.isFile) {
+                    if (file.isFile)
                         file.inputStream().use { fis -> fis.copyTo(zos) }
-                    }
                 }
             }
             lastZipCreated = outputZipFile
@@ -139,8 +137,7 @@ class ImportExportSavesFragment : DialogFragment() {
 
             withContext(Dispatchers.Main) {
                 val file = DocumentFile.fromSingleUri(
-                    context,
-                    DocumentsContract.buildDocumentUri(
+                    context, DocumentsContract.buildDocumentUri(
                         DocumentProvider.AUTHORITY,
                         "${DocumentProvider.ROOT_ID}/temp/${lastZipFile.name}"
                     )

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/IndeterminateProgressDialogFragment.kt

@@ -14,6 +14,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.yuzu.yuzu_emu.databinding.DialogProgressBarBinding
 import org.yuzu.yuzu_emu.model.TaskViewModel
 
+
 class IndeterminateProgressDialogFragment : DialogFragment() {
     private val taskViewModel: TaskViewModel by activityViewModels()
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LicensesFragment.kt

@@ -113,9 +113,7 @@ class LicensesFragment : Fragment() {
     }
 
     private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { _: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _: View, windowInsets: WindowInsetsCompat ->
             val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/LongMessageDialogFragment.kt

@@ -1,62 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.app.Dialog
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.yuzu.yuzu_emu.R
-
-class LongMessageDialogFragment : DialogFragment() {
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val titleId = requireArguments().getInt(TITLE)
-        val description = requireArguments().getString(DESCRIPTION)
-        val helpLinkId = requireArguments().getInt(HELP_LINK)
-
-        val dialog = MaterialAlertDialogBuilder(requireContext())
-            .setPositiveButton(R.string.close, null)
-            .setTitle(titleId)
-            .setMessage(description)
-
-        if (helpLinkId != 0) {
-            dialog.setNeutralButton(R.string.learn_more) { _, _ ->
-                openLink(getString(helpLinkId))
-            }
-        }
-
-        return dialog.show()
-    }
-
-    private fun openLink(link: String) {
-        val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link))
-        startActivity(intent)
-    }
-
-    companion object {
-        const val TAG = "LongMessageDialogFragment"
-
-        private const val TITLE = "Title"
-        private const val DESCRIPTION = "Description"
-        private const val HELP_LINK = "Link"
-
-        fun newInstance(
-            titleId: Int,
-            description: String,
-            helpLinkId: Int = 0
-        ): LongMessageDialogFragment {
-            val dialog = LongMessageDialogFragment()
-            val bundle = Bundle()
-            bundle.apply {
-                putInt(TITLE, titleId)
-                putString(DESCRIPTION, description)
-                putInt(HELP_LINK, helpLinkId)
-            }
-            dialog.arguments = bundle
-            return dialog
-        }
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SearchFragment.kt

@@ -20,7 +20,6 @@ import androidx.fragment.app.activityViewModels
 import androidx.preference.PreferenceManager
 import info.debatty.java.stringsimilarity.Jaccard
 import info.debatty.java.stringsimilarity.JaroWinkler
-import java.util.Locale
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.adapters.GameAdapter
@@ -29,6 +28,9 @@ import org.yuzu.yuzu_emu.layout.AutofitGridLayoutManager
 import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
+import org.yuzu.yuzu_emu.utils.FileUtil
+import org.yuzu.yuzu_emu.utils.Log
+import java.util.Locale
 
 class SearchFragment : Fragment() {
     private var _binding: FragmentSearchBinding? = null
@@ -125,15 +127,24 @@ class SearchFragment : Fragment() {
                 }
             }
 
-            R.id.chip_homebrew -> baseList.filter { it.isHomebrew }
+            R.id.chip_homebrew -> {
+                baseList.filter {
+                    Log.error("Guh - ${it.path}")
+                    FileUtil.hasExtension(it.path, "nro")
+                            || FileUtil.hasExtension(it.path, "nso")
+                }
+            }
 
-            R.id.chip_retail -> baseList.filter { !it.isHomebrew }
+            R.id.chip_retail -> baseList.filter {
+                FileUtil.hasExtension(it.path, "xci")
+                        || FileUtil.hasExtension(it.path, "nsp")
+            }
 
             else -> baseList
         }
 
-        if (binding.searchText.text.toString().isEmpty() &&
-            binding.chipGroup.checkedChipId != View.NO_ID
+        if (binding.searchText.text.toString().isEmpty()
+            && binding.chipGroup.checkedChipId != View.NO_ID
         ) {
             gamesViewModel.setSearchedGames(filteredList)
             return
@@ -168,16 +179,14 @@ class SearchFragment : Fragment() {
     private fun focusSearch() {
         if (_binding != null) {
             binding.searchText.requestFocus()
-            val imm = requireActivity()
-                .getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager?
+            val imm =
+                requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager?
             imm?.showSoftInput(binding.searchText, InputMethodManager.SHOW_IMPLICIT)
         }
     }
 
     private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { view: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view: View, windowInsets: WindowInsetsCompat ->
             val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
             val extraListSpacing = resources.getDimensionPixelSize(R.dimen.spacing_med)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt

@@ -25,7 +25,6 @@ import androidx.navigation.findNavController
 import androidx.preference.PreferenceManager
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.transition.MaterialFadeThrough
-import java.io.File
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.adapters.SetupAdapter
@@ -36,6 +35,7 @@ import org.yuzu.yuzu_emu.model.SetupPage
 import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 import org.yuzu.yuzu_emu.utils.GameHelper
+import java.io.File
 
 class SetupFragment : Fragment() {
     private var _binding: FragmentSetupBinding? = null
@@ -82,8 +82,7 @@ class SetupFragment : Fragment() {
                         requireActivity().finish()
                     }
                 }
-            }
-        )
+            })
 
         requireActivity().window.navigationBarColor =
             ContextCompat.getColor(requireContext(), android.R.color.transparent)
@@ -149,20 +148,14 @@ class SetupFragment : Fragment() {
                     R.drawable.ic_add,
                     true,
                     R.string.add_games,
-                    {
-                        mainActivity.getGamesDirectory.launch(
-                            Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data
-                        )
-                    },
+                    { mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data) },
                     true,
                     R.string.add_games_warning,
                     R.string.add_games_warning_description,
                     R.string.add_games_warning_help,
                     {
                         val preferences =
-                            PreferenceManager.getDefaultSharedPreferences(
-                                YuzuApplication.appContext
-                            )
+                            PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
                         preferences.getString(GameHelper.KEY_GAME_PATH, "")!!.isNotEmpty()
                     }
                 )
@@ -267,9 +260,7 @@ class SetupFragment : Fragment() {
     @RequiresApi(Build.VERSION_CODES.TIRAMISU)
     private val permissionLauncher =
         registerForActivityResult(ActivityResultContracts.RequestPermission()) {
-            if (!it &&
-                !shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)
-            ) {
+            if (!it && !shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)) {
                 PermissionDeniedDialogFragment().show(
                     childFragmentManager,
                     PermissionDeniedDialogFragment.TAG
@@ -324,9 +315,7 @@ class SetupFragment : Fragment() {
     }
 
     private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { view: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view: View, windowInsets: WindowInsetsCompat ->
             val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
             view.setPadding(

src/android/app/src/main/java/org/yuzu/yuzu_emu/layout/AutofitGridLayoutManager.kt

@@ -44,9 +44,7 @@ class AutofitGridLayoutManager(
     override fun onLayoutChildren(recycler: Recycler, state: RecyclerView.State) {
         val width = width
         val height = height
-        if (columnWidth > 0 && width > 0 && height > 0 &&
-            (isColumnWidthChanged || lastWidth != width || lastHeight != height)
-        ) {
+        if (columnWidth > 0 && width > 0 && height > 0 && (isColumnWidthChanged || lastWidth != width || lastHeight != height)) {
             val totalSpace: Int = if (orientation == VERTICAL) {
                 width - paddingRight - paddingLeft
             } else {

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt

@@ -4,9 +4,9 @@
 package org.yuzu.yuzu_emu.model
 
 import android.os.Parcelable
-import java.util.HashSet
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
+import java.util.HashSet
 
 @Parcelize
 @Serializable
@@ -16,34 +16,26 @@ class Game(
     val regions: String,
     val path: String,
     val gameId: String,
-    val company: String,
-    val isHomebrew: Boolean
+    val company: String
 ) : Parcelable {
     val keyAddedToLibraryTime get() = "${gameId}_AddedToLibraryTime"
     val keyLastPlayedTime get() = "${gameId}_LastPlayed"
 
     override fun equals(other: Any?): Boolean {
-        if (other !is Game) {
+        if (other !is Game)
             return false
-        }
 
-        return hashCode() == other.hashCode()
-    }
-
-    override fun hashCode(): Int {
-        var result = title.hashCode()
-        result = 31 * result + description.hashCode()
-        result = 31 * result + regions.hashCode()
-        result = 31 * result + path.hashCode()
-        result = 31 * result + gameId.hashCode()
-        result = 31 * result + company.hashCode()
-        result = 31 * result + isHomebrew.hashCode()
-        return result
+        return title == other.title
+                && description == other.description
+                && regions == other.regions
+                && path == other.path
+                && gameId == other.gameId
+                && company == other.company
     }
 
     companion object {
         val extensions: Set<String> = HashSet(
-            listOf("xci", "nsp", "nca", "nro")
+            listOf(".xci", ".nsp", ".nca", ".nro")
         )
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt

@@ -10,19 +10,16 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.preference.PreferenceManager
-import java.util.Locale
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.MissingFieldException
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.utils.GameHelper
+import java.util.Locale
 
-@OptIn(ExperimentalSerializationApi::class)
 class GamesViewModel : ViewModel() {
     private val _games = MutableLiveData<List<Game>>(emptyList())
     val games: LiveData<List<Game>> get() = _games
@@ -52,13 +49,7 @@ class GamesViewModel : ViewModel() {
         if (storedGames!!.isNotEmpty()) {
             val deserializedGames = mutableSetOf<Game>()
             storedGames.forEach {
-                val game: Game
-                try {
-                    game = Json.decodeFromString(it)
-                } catch (e: MissingFieldException) {
-                    return@forEach
-                }
-
+                val game: Game = Json.decodeFromString(it)
                 val gameExists =
                     DocumentFile.fromSingleUri(YuzuApplication.appContext, Uri.parse(game.path))
                         ?.exists()
@@ -99,9 +90,8 @@ class GamesViewModel : ViewModel() {
     }
 
     fun reloadGames(directoryChanged: Boolean) {
-        if (isReloading.value == true) {
+        if (isReloading.value == true)
             return
-        }
         _isReloading.postValue(true)
 
         viewModelScope.launch {

src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt

@@ -6,6 +6,7 @@ package org.yuzu.yuzu_emu.overlay
 import android.app.Activity
 import android.content.Context
 import android.content.SharedPreferences
+import android.content.res.Configuration
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Point
@@ -23,8 +24,6 @@ import android.view.WindowInsets
 import androidx.core.content.ContextCompat
 import androidx.preference.PreferenceManager
 import androidx.window.layout.WindowMetricsCalculator
-import kotlin.math.max
-import kotlin.math.min
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.NativeLibrary.ButtonType
 import org.yuzu.yuzu_emu.NativeLibrary.StickType
@@ -32,13 +31,14 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.utils.EmulationMenuSettings
+import kotlin.math.max
+import kotlin.math.min
 
 /**
  * Draws the interactive input overlay on top of the
  * [SurfaceView] that is rendering emulation.
  */
-class InputOverlay(context: Context, attrs: AttributeSet?) :
-    SurfaceView(context, attrs),
+class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context, attrs),
     OnTouchListener {
     private val overlayButtons: MutableSet<InputOverlayDrawableButton> = HashSet()
     private val overlayDpads: MutableSet<InputOverlayDrawableDpad> = HashSet()
@@ -51,14 +51,12 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
 
     private lateinit var windowInsets: WindowInsets
 
-    var orientation = LANDSCAPE
-
     override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
         super.onLayout(changed, left, top, right, bottom)
 
         windowInsets = rootWindowInsets
 
-        if (!preferences.getBoolean("${Settings.PREF_OVERLAY_INIT}$orientation", false)) {
+        if (!preferences.getBoolean(Settings.PREF_OVERLAY_INIT, false)) {
             defaultOverlay()
         }
 
@@ -95,11 +93,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
 
         var shouldUpdateView = false
         val playerIndex =
-            if (NativeLibrary.isHandheldOnly()) {
-                NativeLibrary.ConsoleDevice
-            } else {
-                NativeLibrary.Player1Device
-            }
+            if (NativeLibrary.isHandheldOnly()) NativeLibrary.ConsoleDevice else NativeLibrary.Player1Device
 
         for (button in overlayButtons) {
             if (!button.updateStatus(event)) {
@@ -162,9 +156,8 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
             shouldUpdateView = true
         }
 
-        if (shouldUpdateView) {
+        if (shouldUpdateView)
             invalidate()
-        }
 
         if (!preferences.getBoolean(Settings.PREF_TOUCH_ENABLED, true)) {
             return true
@@ -240,6 +233,10 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
         val fingerPositionX = event.getX(pointerIndex).toInt()
         val fingerPositionY = event.getY(pointerIndex).toInt()
 
+        // TODO: Provide support for portrait layout
+        //val orientation =
+        //    if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) "-Portrait" else ""
+
         for (button in overlayButtons) {
             // Determine the button state to apply based on the MotionEvent action flag.
             when (event.action and MotionEvent.ACTION_MASK) {
@@ -248,9 +245,9 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
                     // If no button is being moved now, remember the currently touched button to move.
                     if (buttonBeingConfigured == null &&
                         button.bounds.contains(
-                                fingerPositionX,
-                                fingerPositionY
-                            )
+                            fingerPositionX,
+                            fingerPositionY
+                        )
                     ) {
                         buttonBeingConfigured = button
                         buttonBeingConfigured!!.onConfigureTouch(event)
@@ -269,7 +266,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
                         buttonBeingConfigured!!.buttonId,
                         buttonBeingConfigured!!.bounds.centerX(),
                         buttonBeingConfigured!!.bounds.centerY(),
-                        orientation
+                        ""
                     )
                     buttonBeingConfigured = null
                 }
@@ -302,7 +299,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
                         dpadBeingConfigured!!.upId,
                         dpadBeingConfigured!!.bounds.centerX(),
                         dpadBeingConfigured!!.bounds.centerY(),
-                        orientation
+                        ""
                     )
                     dpadBeingConfigured = null
                 }
@@ -314,9 +311,9 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
                 MotionEvent.ACTION_DOWN,
                 MotionEvent.ACTION_POINTER_DOWN -> if (joystickBeingConfigured == null &&
                     joystick.bounds.contains(
-                            fingerPositionX,
-                            fingerPositionY
-                        )
+                        fingerPositionX,
+                        fingerPositionY
+                    )
                 ) {
                     joystickBeingConfigured = joystick
                     joystickBeingConfigured!!.onConfigureTouch(event)
@@ -333,7 +330,7 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
                         joystickBeingConfigured!!.buttonId,
                         joystickBeingConfigured!!.bounds.centerX(),
                         joystickBeingConfigured!!.bounds.centerY(),
-                        orientation
+                        ""
                     )
                     joystickBeingConfigured = null
                 }
@@ -536,6 +533,8 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
         overlayButtons.clear()
         overlayDpads.clear()
         overlayJoysticks.clear()
+        val orientation =
+            if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) "-Portrait" else ""
 
         // Add all the enabled overlay items back to the HashSet.
         if (EmulationMenuSettings.showOverlay) {
@@ -549,8 +548,8 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
         val min = windowSize.first
         val max = windowSize.second
         PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext).edit()
-            .putFloat("$sharedPrefsId-X$orientation", (x - min.x).toFloat() / max.x)
-            .putFloat("$sharedPrefsId-Y$orientation", (y - min.y).toFloat() / max.y)
+            .putFloat("$sharedPrefsId$orientation-X", (x - min.x).toFloat() / max.x)
+            .putFloat("$sharedPrefsId$orientation-Y", (y - min.y).toFloat() / max.y)
             .apply()
     }
 
@@ -559,250 +558,145 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
     }
 
     private fun defaultOverlay() {
-        if (!preferences.getBoolean("${Settings.PREF_OVERLAY_INIT}$orientation", false)) {
-            defaultOverlayByLayout(orientation)
+        if (!preferences.getBoolean(Settings.PREF_OVERLAY_INIT, false)) {
+            defaultOverlayLandscape()
         }
 
         resetButtonPlacement()
         preferences.edit()
-            .putBoolean("${Settings.PREF_OVERLAY_INIT}$orientation", true)
+            .putBoolean(Settings.PREF_OVERLAY_INIT, true)
             .apply()
     }
 
     fun resetButtonPlacement() {
-        defaultOverlayByLayout(orientation)
+        defaultOverlayLandscape()
         refreshControls()
     }
 
-    private val landscapeResources = arrayOf(
-        R.integer.SWITCH_BUTTON_A_X,
-        R.integer.SWITCH_BUTTON_A_Y,
-        R.integer.SWITCH_BUTTON_B_X,
-        R.integer.SWITCH_BUTTON_B_Y,
-        R.integer.SWITCH_BUTTON_X_X,
-        R.integer.SWITCH_BUTTON_X_Y,
-        R.integer.SWITCH_BUTTON_Y_X,
-        R.integer.SWITCH_BUTTON_Y_Y,
-        R.integer.SWITCH_TRIGGER_ZL_X,
-        R.integer.SWITCH_TRIGGER_ZL_Y,
-        R.integer.SWITCH_TRIGGER_ZR_X,
-        R.integer.SWITCH_TRIGGER_ZR_Y,
-        R.integer.SWITCH_BUTTON_DPAD_X,
-        R.integer.SWITCH_BUTTON_DPAD_Y,
-        R.integer.SWITCH_TRIGGER_L_X,
-        R.integer.SWITCH_TRIGGER_L_Y,
-        R.integer.SWITCH_TRIGGER_R_X,
-        R.integer.SWITCH_TRIGGER_R_Y,
-        R.integer.SWITCH_BUTTON_PLUS_X,
-        R.integer.SWITCH_BUTTON_PLUS_Y,
-        R.integer.SWITCH_BUTTON_MINUS_X,
-        R.integer.SWITCH_BUTTON_MINUS_Y,
-        R.integer.SWITCH_BUTTON_HOME_X,
-        R.integer.SWITCH_BUTTON_HOME_Y,
-        R.integer.SWITCH_BUTTON_CAPTURE_X,
-        R.integer.SWITCH_BUTTON_CAPTURE_Y,
-        R.integer.SWITCH_STICK_R_X,
-        R.integer.SWITCH_STICK_R_Y,
-        R.integer.SWITCH_STICK_L_X,
-        R.integer.SWITCH_STICK_L_Y
-    )
-
-    private val portraitResources = arrayOf(
-        R.integer.SWITCH_BUTTON_A_X_PORTRAIT,
-        R.integer.SWITCH_BUTTON_A_Y_PORTRAIT,
-        R.integer.SWITCH_BUTTON_B_X_PORTRAIT,
-        R.integer.SWITCH_BUTTON_B_Y_PORTRAIT,
-        R.integer.SWITCH_BUTTON_X_X_PORTRAIT,
-        R.integer.SWITCH_BUTTON_X_Y_PORTRAIT,
-        R.integer.SWITCH_BUTTON_Y_X_PORTRAIT,
-        R.integer.SWITCH_BUTTON_Y_Y_PORTRAIT,
-        R.integer.SWITCH_TRIGGER_ZL_X_PORTRAIT,
-        R.integer.SWITCH_TRIGGER_ZL_Y_PORTRAIT,
-        R.integer.SWITCH_TRIGGER_ZR_X_PORTRAIT,
-        R.integer.SWITCH_TRIGGER_ZR_Y_PORTRAIT,
-        R.integer.SWITCH_BUTTON_DPAD_X_PORTRAIT,
-        R.integer.SWITCH_BUTTON_DPAD_Y_PORTRAIT,
-        R.integer.SWITCH_TRIGGER_L_X_PORTRAIT,
-        R.integer.SWITCH_TRIGGER_L_Y_PORTRAIT,
-        R.integer.SWITCH_TRIGGER_R_X_PORTRAIT,
-        R.integer.SWITCH_TRIGGER_R_Y_PORTRAIT,
-        R.integer.SWITCH_BUTTON_PLUS_X_PORTRAIT,
-        R.integer.SWITCH_BUTTON_PLUS_Y_PORTRAIT,
-        R.integer.SWITCH_BUTTON_MINUS_X_PORTRAIT,
-        R.integer.SWITCH_BUTTON_MINUS_Y_PORTRAIT,
-        R.integer.SWITCH_BUTTON_HOME_X_PORTRAIT,
-        R.integer.SWITCH_BUTTON_HOME_Y_PORTRAIT,
-        R.integer.SWITCH_BUTTON_CAPTURE_X_PORTRAIT,
-        R.integer.SWITCH_BUTTON_CAPTURE_Y_PORTRAIT,
-        R.integer.SWITCH_STICK_R_X_PORTRAIT,
-        R.integer.SWITCH_STICK_R_Y_PORTRAIT,
-        R.integer.SWITCH_STICK_L_X_PORTRAIT,
-        R.integer.SWITCH_STICK_L_Y_PORTRAIT
-    )
-
-    private val foldableResources = arrayOf(
-        R.integer.SWITCH_BUTTON_A_X_FOLDABLE,
-        R.integer.SWITCH_BUTTON_A_Y_FOLDABLE,
-        R.integer.SWITCH_BUTTON_B_X_FOLDABLE,
-        R.integer.SWITCH_BUTTON_B_Y_FOLDABLE,
-        R.integer.SWITCH_BUTTON_X_X_FOLDABLE,
-        R.integer.SWITCH_BUTTON_X_Y_FOLDABLE,
-        R.integer.SWITCH_BUTTON_Y_X_FOLDABLE,
-        R.integer.SWITCH_BUTTON_Y_Y_FOLDABLE,
-        R.integer.SWITCH_TRIGGER_ZL_X_FOLDABLE,
-        R.integer.SWITCH_TRIGGER_ZL_Y_FOLDABLE,
-        R.integer.SWITCH_TRIGGER_ZR_X_FOLDABLE,
-        R.integer.SWITCH_TRIGGER_ZR_Y_FOLDABLE,
-        R.integer.SWITCH_BUTTON_DPAD_X_FOLDABLE,
-        R.integer.SWITCH_BUTTON_DPAD_Y_FOLDABLE,
-        R.integer.SWITCH_TRIGGER_L_X_FOLDABLE,
-        R.integer.SWITCH_TRIGGER_L_Y_FOLDABLE,
-        R.integer.SWITCH_TRIGGER_R_X_FOLDABLE,
-        R.integer.SWITCH_TRIGGER_R_Y_FOLDABLE,
-        R.integer.SWITCH_BUTTON_PLUS_X_FOLDABLE,
-        R.integer.SWITCH_BUTTON_PLUS_Y_FOLDABLE,
-        R.integer.SWITCH_BUTTON_MINUS_X_FOLDABLE,
-        R.integer.SWITCH_BUTTON_MINUS_Y_FOLDABLE,
-        R.integer.SWITCH_BUTTON_HOME_X_FOLDABLE,
-        R.integer.SWITCH_BUTTON_HOME_Y_FOLDABLE,
-        R.integer.SWITCH_BUTTON_CAPTURE_X_FOLDABLE,
-        R.integer.SWITCH_BUTTON_CAPTURE_Y_FOLDABLE,
-        R.integer.SWITCH_STICK_R_X_FOLDABLE,
-        R.integer.SWITCH_STICK_R_Y_FOLDABLE,
-        R.integer.SWITCH_STICK_L_X_FOLDABLE,
-        R.integer.SWITCH_STICK_L_Y_FOLDABLE
-    )
-
-    private fun getResourceValue(orientation: String, position: Int): Float {
-        return when (orientation) {
-            PORTRAIT -> resources.getInteger(portraitResources[position]).toFloat() / 1000
-            FOLDABLE -> resources.getInteger(foldableResources[position]).toFloat() / 1000
-            else -> resources.getInteger(landscapeResources[position]).toFloat() / 1000
-        }
-    }
-
-    private fun defaultOverlayByLayout(orientation: String) {
+    private fun defaultOverlayLandscape() {
         // Each value represents the position of the button in relation to the screen size without insets.
         preferences.edit()
             .putFloat(
-                ButtonType.BUTTON_A.toString() + "-X$orientation",
-                getResourceValue(orientation, 0)
+                ButtonType.BUTTON_A.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_BUTTON_A_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_A.toString() + "-Y$orientation",
-                getResourceValue(orientation, 1)
+                ButtonType.BUTTON_A.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_BUTTON_A_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_B.toString() + "-X$orientation",
-                getResourceValue(orientation, 2)
+                ButtonType.BUTTON_B.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_BUTTON_B_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_B.toString() + "-Y$orientation",
-                getResourceValue(orientation, 3)
+                ButtonType.BUTTON_B.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_BUTTON_B_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_X.toString() + "-X$orientation",
-                getResourceValue(orientation, 4)
+                ButtonType.BUTTON_X.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_BUTTON_X_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_X.toString() + "-Y$orientation",
-                getResourceValue(orientation, 5)
+                ButtonType.BUTTON_X.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_BUTTON_X_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_Y.toString() + "-X$orientation",
-                getResourceValue(orientation, 6)
+                ButtonType.BUTTON_Y.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_BUTTON_Y_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_Y.toString() + "-Y$orientation",
-                getResourceValue(orientation, 7)
+                ButtonType.BUTTON_Y.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_BUTTON_Y_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.TRIGGER_ZL.toString() + "-X$orientation",
-                getResourceValue(orientation, 8)
+                ButtonType.TRIGGER_ZL.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_TRIGGER_ZL_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.TRIGGER_ZL.toString() + "-Y$orientation",
-                getResourceValue(orientation, 9)
+                ButtonType.TRIGGER_ZL.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_TRIGGER_ZL_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.TRIGGER_ZR.toString() + "-X$orientation",
-                getResourceValue(orientation, 10)
+                ButtonType.TRIGGER_ZR.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_TRIGGER_ZR_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.TRIGGER_ZR.toString() + "-Y$orientation",
-                getResourceValue(orientation, 11)
+                ButtonType.TRIGGER_ZR.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_TRIGGER_ZR_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.DPAD_UP.toString() + "-X$orientation",
-                getResourceValue(orientation, 12)
+                ButtonType.DPAD_UP.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_BUTTON_DPAD_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.DPAD_UP.toString() + "-Y$orientation",
-                getResourceValue(orientation, 13)
+                ButtonType.DPAD_UP.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_BUTTON_DPAD_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.TRIGGER_L.toString() + "-X$orientation",
-                getResourceValue(orientation, 14)
+                ButtonType.TRIGGER_L.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_TRIGGER_L_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.TRIGGER_L.toString() + "-Y$orientation",
-                getResourceValue(orientation, 15)
+                ButtonType.TRIGGER_L.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_TRIGGER_L_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.TRIGGER_R.toString() + "-X$orientation",
-                getResourceValue(orientation, 16)
+                ButtonType.TRIGGER_R.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_TRIGGER_R_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.TRIGGER_R.toString() + "-Y$orientation",
-                getResourceValue(orientation, 17)
+                ButtonType.TRIGGER_R.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_TRIGGER_R_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_PLUS.toString() + "-X$orientation",
-                getResourceValue(orientation, 18)
+                ButtonType.BUTTON_PLUS.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_BUTTON_PLUS_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_PLUS.toString() + "-Y$orientation",
-                getResourceValue(orientation, 19)
+                ButtonType.BUTTON_PLUS.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_BUTTON_PLUS_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_MINUS.toString() + "-X$orientation",
-                getResourceValue(orientation, 20)
+                ButtonType.BUTTON_MINUS.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_BUTTON_MINUS_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_MINUS.toString() + "-Y$orientation",
-                getResourceValue(orientation, 21)
+                ButtonType.BUTTON_MINUS.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_BUTTON_MINUS_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_HOME.toString() + "-X$orientation",
-                getResourceValue(orientation, 22)
+                ButtonType.BUTTON_HOME.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_BUTTON_HOME_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_HOME.toString() + "-Y$orientation",
-                getResourceValue(orientation, 23)
+                ButtonType.BUTTON_HOME.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_BUTTON_HOME_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_CAPTURE.toString() + "-X$orientation",
-                getResourceValue(orientation, 24)
+                ButtonType.BUTTON_CAPTURE.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_BUTTON_CAPTURE_X)
+                    .toFloat() / 1000
             )
             .putFloat(
-                ButtonType.BUTTON_CAPTURE.toString() + "-Y$orientation",
-                getResourceValue(orientation, 25)
+                ButtonType.BUTTON_CAPTURE.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_BUTTON_CAPTURE_Y)
+                    .toFloat() / 1000
             )
             .putFloat(
-                ButtonType.STICK_R.toString() + "-X$orientation",
-                getResourceValue(orientation, 26)
+                ButtonType.STICK_R.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_STICK_R_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.STICK_R.toString() + "-Y$orientation",
-                getResourceValue(orientation, 27)
+                ButtonType.STICK_R.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_STICK_R_Y).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.STICK_L.toString() + "-X$orientation",
-                getResourceValue(orientation, 28)
+                ButtonType.STICK_L.toString() + "-X",
+                resources.getInteger(R.integer.SWITCH_STICK_L_X).toFloat() / 1000
             )
             .putFloat(
-                ButtonType.STICK_L.toString() + "-Y$orientation",
-                getResourceValue(orientation, 29)
+                ButtonType.STICK_L.toString() + "-Y",
+                resources.getInteger(R.integer.SWITCH_STICK_L_Y).toFloat() / 1000
             )
             .apply()
     }
@@ -815,17 +709,13 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
         private val preferences: SharedPreferences =
             PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
 
-        const val LANDSCAPE = ""
-        const val PORTRAIT = "_Portrait"
-        const val FOLDABLE = "_Foldable"
-
         /**
          * Resizes a [Bitmap] by a given scale factor
          *
          * @param context       Context for getting the vector drawable
          * @param drawableId    The ID of the drawable to scale.
          * @param scale         The scale factor for the bitmap.
-         * @return The scaled [Bitmap]
+         * @return              The scaled [Bitmap]
          */
         private fun getBitmap(context: Context, drawableId: Int, scale: Float): Bitmap {
             val vectorDrawable = ContextCompat.getDrawable(context, drawableId) as VectorDrawable
@@ -859,13 +749,14 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
          * Gets the safe screen size for drawing the overlay
          *
          * @param context   Context for getting the window metrics
-         * @return A pair of points, the first being the top left corner of the safe area,
+         * @return          A pair of points, the first being the top left corner of the safe area,
          *                  the second being the bottom right corner of the safe area
          */
         private fun getSafeScreenSize(context: Context): Pair<Point, Point> {
             // Get screen size
-            val windowMetrics = WindowMetricsCalculator.getOrCreate()
-                .computeCurrentWindowMetrics(context as Activity)
+            val windowMetrics =
+                WindowMetricsCalculator.getOrCreate()
+                    .computeCurrentWindowMetrics(context as Activity)
             var maxY = windowMetrics.bounds.height().toFloat()
             var maxX = windowMetrics.bounds.width().toFloat()
             var minY = 0
@@ -874,26 +765,18 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
             // If we have API access, calculate the safe area to draw the overlay
             var cutoutLeft = 0
             var cutoutBottom = 0
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                val insets = context.windowManager.currentWindowMetrics.windowInsets.displayCutout
-                if (insets != null) {
-                    if (insets.boundingRectTop.bottom != 0 &&
-                        insets.boundingRectTop.bottom > maxY / 2
-                    ) {
-                        maxY = insets.boundingRectTop.bottom.toFloat()
-                    }
-                    if (insets.boundingRectRight.left != 0 &&
-                        insets.boundingRectRight.left > maxX / 2
-                    ) {
-                        maxX = insets.boundingRectRight.left.toFloat()
-                    }
+            val insets = context.windowManager.currentWindowMetrics.windowInsets.displayCutout
+            if (insets != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                if (insets.boundingRectTop.bottom != 0 && insets.boundingRectTop.bottom > maxY / 2)
+                    insets.boundingRectTop.bottom.toFloat() else maxY
+                if (insets.boundingRectRight.left != 0 && insets.boundingRectRight.left > maxX / 2)
+                    insets.boundingRectRight.left.toFloat() else maxX
 
-                    minX = insets.boundingRectLeft.right - insets.boundingRectLeft.left
-                    minY = insets.boundingRectBottom.top - insets.boundingRectBottom.bottom
+                minX = insets.boundingRectLeft.right - insets.boundingRectLeft.left
+                minY = insets.boundingRectBottom.top - insets.boundingRectBottom.bottom
 
-                    cutoutLeft = insets.boundingRectRight.right - insets.boundingRectRight.left
-                    cutoutBottom = insets.boundingRectTop.top - insets.boundingRectTop.bottom
-                }
+                cutoutLeft = insets.boundingRectRight.right - insets.boundingRectRight.left
+                cutoutBottom = insets.boundingRectTop.top - insets.boundingRectTop.bottom
             }
 
             // This makes sure that if we have an inset on one side of the screen, we mirror it on
@@ -993,8 +876,8 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
 
             // The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
             // These were set in the input overlay configuration menu.
-            val xKey = "$buttonId-X$orientation"
-            val yKey = "$buttonId-Y$orientation"
+            val xKey = "$buttonId$orientation-X"
+            val yKey = "$buttonId$orientation-Y"
             val drawableXPercent = sPrefs.getFloat(xKey, 0f)
             val drawableYPercent = sPrefs.getFloat(yKey, 0f)
             val drawableX = (drawableXPercent * max.x + min.x).toInt()
@@ -1074,8 +957,8 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
 
             // The X and Y coordinates of the InputOverlayDrawableDpad on the InputOverlay.
             // These were set in the input overlay configuration menu.
-            val drawableXPercent = sPrefs.getFloat("${ButtonType.DPAD_UP}-X$orientation", 0f)
-            val drawableYPercent = sPrefs.getFloat("${ButtonType.DPAD_UP}-Y$orientation", 0f)
+            val drawableXPercent = sPrefs.getFloat("${ButtonType.DPAD_UP}$orientation-X", 0f)
+            val drawableYPercent = sPrefs.getFloat("${ButtonType.DPAD_UP}$orientation-Y", 0f)
             val drawableX = (drawableXPercent * max.x + min.x).toInt()
             val drawableY = (drawableYPercent * max.y + min.y).toInt()
             val width = overlayDrawable.width
@@ -1141,8 +1024,8 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
 
             // The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
             // These were set in the input overlay configuration menu.
-            val drawableXPercent = sPrefs.getFloat("$button-X$orientation", 0f)
-            val drawableYPercent = sPrefs.getFloat("$button-Y$orientation", 0f)
+            val drawableXPercent = sPrefs.getFloat("$button$orientation-X", 0f)
+            val drawableYPercent = sPrefs.getFloat("$button$orientation-Y", 0f)
             val drawableX = (drawableXPercent * max.x + min.x).toInt()
             val drawableY = (drawableYPercent * max.y + min.y).toInt()
             val outerScale = 1.66f

src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableDpad.kt

@@ -133,10 +133,7 @@ class InputOverlayDrawableDpad(
             downButtonState = axisY > VIRT_AXIS_DEADZONE
             leftButtonState = axisX < -VIRT_AXIS_DEADZONE
             rightButtonState = axisX > VIRT_AXIS_DEADZONE
-            return oldUpState != upButtonState ||
-                oldDownState != downButtonState ||
-                oldLeftState != leftButtonState ||
-                oldRightState != rightButtonState
+            return oldUpState != upButtonState || oldDownState != downButtonState || oldLeftState != leftButtonState || oldRightState != rightButtonState
         }
         return false
     }

src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlayDrawableJoystick.kt

@@ -9,12 +9,12 @@ import android.graphics.Canvas
 import android.graphics.Rect
 import android.graphics.drawable.BitmapDrawable
 import android.view.MotionEvent
+import org.yuzu.yuzu_emu.NativeLibrary
+import org.yuzu.yuzu_emu.utils.EmulationMenuSettings
 import kotlin.math.atan2
 import kotlin.math.cos
 import kotlin.math.sin
 import kotlin.math.sqrt
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.utils.EmulationMenuSettings
 
 /**
  * Custom [BitmapDrawable] that is capable
@@ -241,22 +241,14 @@ class InputOverlayDrawableJoystick(
     private fun setInnerBounds() {
         var x = virtBounds.centerX() + (xAxis * (virtBounds.width() / 2)).toInt()
         var y = virtBounds.centerY() + (yAxis * (virtBounds.height() / 2)).toInt()
-        if (x > virtBounds.centerX() + virtBounds.width() / 2) {
-            x =
-                virtBounds.centerX() + virtBounds.width() / 2
-        }
-        if (x < virtBounds.centerX() - virtBounds.width() / 2) {
-            x =
-                virtBounds.centerX() - virtBounds.width() / 2
-        }
-        if (y > virtBounds.centerY() + virtBounds.height() / 2) {
-            y =
-                virtBounds.centerY() + virtBounds.height() / 2
-        }
-        if (y < virtBounds.centerY() - virtBounds.height() / 2) {
-            y =
-                virtBounds.centerY() - virtBounds.height() / 2
-        }
+        if (x > virtBounds.centerX() + virtBounds.width() / 2) x =
+            virtBounds.centerX() + virtBounds.width() / 2
+        if (x < virtBounds.centerX() - virtBounds.width() / 2) x =
+            virtBounds.centerX() - virtBounds.width() / 2
+        if (y > virtBounds.centerY() + virtBounds.height() / 2) y =
+            virtBounds.centerY() + virtBounds.height() / 2
+        if (y < virtBounds.centerY() - virtBounds.height() / 2) y =
+            virtBounds.centerY() - virtBounds.height() / 2
         val width = pressedStateInnerBitmap.bounds.width() / 2
         val height = pressedStateInnerBitmap.bounds.height() / 2
         defaultStateInnerBitmap.setBounds(

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/GamesFragment.kt

@@ -99,9 +99,7 @@ class GamesFragment : Fragment() {
             }
             shouldSwapData.observe(viewLifecycleOwner) { shouldSwapData ->
                 if (shouldSwapData) {
-                    (binding.gridGames.adapter as GameAdapter).submitList(
-                        gamesViewModel.games.value!!
-                    )
+                    (binding.gridGames.adapter as GameAdapter).submitList(gamesViewModel.games.value!!)
                     gamesViewModel.setShouldSwapData(false)
                 }
             }
@@ -130,9 +128,7 @@ class GamesFragment : Fragment() {
     }
 
     private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { view: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view: View, windowInsets: WindowInsetsCompat ->
             val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
             val extraListSpacing = resources.getDimensionPixelSize(R.dimen.spacing_large)

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt

@@ -4,7 +4,6 @@
 package org.yuzu.yuzu_emu.ui.main
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
@@ -27,9 +26,6 @@ import androidx.preference.PreferenceManager
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.navigation.NavigationBarView
-import java.io.File
-import java.io.FilenameFilter
-import java.io.IOException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -43,11 +39,13 @@ import org.yuzu.yuzu_emu.features.settings.model.SettingsViewModel
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsActivity
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
-import org.yuzu.yuzu_emu.fragments.LongMessageDialogFragment
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
 import org.yuzu.yuzu_emu.model.GamesViewModel
 import org.yuzu.yuzu_emu.model.HomeViewModel
 import org.yuzu.yuzu_emu.utils.*
+import java.io.File
+import java.io.FilenameFilter
+import java.io.IOException
 
 class MainActivity : AppCompatActivity(), ThemeProvider {
     private lateinit var binding: ActivityMainBinding
@@ -88,9 +86,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 ThemeHelper.SYSTEM_BAR_ALPHA
             )
         )
-        if (InsetsHelper.getSystemGestureType(applicationContext) !=
-            InsetsHelper.GESTURE_NAVIGATION
-        ) {
+        if (InsetsHelper.getSystemGestureType(applicationContext) != InsetsHelper.GESTURE_NAVIGATION) {
             binding.navigationBarShade.setBackgroundColor(
                 ThemeHelper.getColorWithOpacity(
                     MaterialColors.getColor(
@@ -176,9 +172,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                         binding.navigationView.height.toFloat() * 2
                     translationY(0f)
                 } else {
-                    if (ViewCompat.getLayoutDirection(binding.navigationView) ==
-                        ViewCompat.LAYOUT_DIRECTION_LTR
-                    ) {
+                    if (ViewCompat.getLayoutDirection(binding.navigationView) == ViewCompat.LAYOUT_DIRECTION_LTR) {
                         binding.navigationView.translationX =
                             binding.navigationView.width.toFloat() * -2
                         translationX(0f)
@@ -195,9 +189,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 if (smallLayout) {
                     translationY(binding.navigationView.height.toFloat() * 2)
                 } else {
-                    if (ViewCompat.getLayoutDirection(binding.navigationView) ==
-                        ViewCompat.LAYOUT_DIRECTION_LTR
-                    ) {
+                    if (ViewCompat.getLayoutDirection(binding.navigationView) == ViewCompat.LAYOUT_DIRECTION_LTR) {
                         translationX(binding.navigationView.width.toFloat() * -2)
                     } else {
                         translationX(binding.navigationView.width.toFloat() * 2)
@@ -242,9 +234,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
     }
 
     private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { _: View, windowInsets: WindowInsetsCompat ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _: View, windowInsets: WindowInsetsCompat ->
             val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
             val mlpStatusShade = binding.statusBarShade.layoutParams as MarginLayoutParams
             mlpStatusShade.height = insets.top
@@ -266,9 +256,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     val getGamesDirectory =
         registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->
-            if (result == null) {
+            if (result == null)
                 return@registerForActivityResult
-            }
 
             contentResolver.takePersistableUriPermission(
                 result,
@@ -292,14 +281,13 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     val getProdKey =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
+            if (result == null)
                 return@registerForActivityResult
-            }
 
-            if (FileUtil.getExtension(result) != "keys") {
+            if (!FileUtil.hasExtension(result.toString(), "keys")) {
                 MessageDialogFragment.newInstance(
                     R.string.reading_keys_failure,
-                    R.string.install_prod_keys_failure_extension_description
+                    R.string.install_keys_failure_extension_description
                 ).show(supportFragmentManager, MessageDialogFragment.TAG)
                 return@registerForActivityResult
             }
@@ -336,9 +324,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     val getFirmware =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
+            if (result == null)
                 return@registerForActivityResult
-            }
 
             val inputZip = contentResolver.openInputStream(result)
             if (inputZip == null) {
@@ -389,14 +376,13 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     val getAmiiboKey =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
+            if (result == null)
                 return@registerForActivityResult
-            }
 
-            if (FileUtil.getExtension(result) != "bin") {
+            if (!FileUtil.hasExtension(result.toString(), "bin")) {
                 MessageDialogFragment.newInstance(
                     R.string.reading_keys_failure,
-                    R.string.install_amiibo_keys_failure_extension_description
+                    R.string.install_keys_failure_extension_description
                 ).show(supportFragmentManager, MessageDialogFragment.TAG)
                 return@registerForActivityResult
             }
@@ -432,9 +418,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     val getDriver =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
+            if (result == null)
                 return@registerForActivityResult
-            }
 
             val takeFlags =
                 Intent.FLAG_GRANT_WRITE_URI_PERMISSION or Intent.FLAG_GRANT_READ_URI_PERMISSION
@@ -482,111 +467,4 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                 }
             }
         }
-
-    val installGameUpdate = registerForActivityResult(
-        ActivityResultContracts.OpenMultipleDocuments()
-    ) { documents: List<Uri> ->
-        if (documents.isNotEmpty()) {
-            IndeterminateProgressDialogFragment.newInstance(
-                this@MainActivity,
-                R.string.install_game_content
-            ) {
-                var installSuccess = 0
-                var installOverwrite = 0
-                var errorBaseGame = 0
-                var errorExtension = 0
-                var errorOther = 0
-                var errorTotal = 0
-                lifecycleScope.launch {
-                    documents.forEach {
-                        when (NativeLibrary.installFileToNand(it.toString())) {
-                            NativeLibrary.InstallFileToNandResult.Success -> {
-                                installSuccess += 1
-                            }
-
-                            NativeLibrary.InstallFileToNandResult.SuccessFileOverwritten -> {
-                                installOverwrite += 1
-                            }
-
-                            NativeLibrary.InstallFileToNandResult.ErrorBaseGame -> {
-                                errorBaseGame += 1
-                            }
-
-                            NativeLibrary.InstallFileToNandResult.ErrorFilenameExtension -> {
-                                errorExtension += 1
-                            }
-
-                            else -> {
-                                errorOther += 1
-                            }
-                        }
-                    }
-                    withContext(Dispatchers.Main) {
-                        val separator = System.getProperty("line.separator") ?: "\n"
-                        val installResult = StringBuilder()
-                        if (installSuccess > 0) {
-                            installResult.append(
-                                getString(
-                                    R.string.install_game_content_success_install,
-                                    installSuccess
-                                )
-                            )
-                            installResult.append(separator)
-                        }
-                        if (installOverwrite > 0) {
-                            installResult.append(
-                                getString(
-                                    R.string.install_game_content_success_overwrite,
-                                    installOverwrite
-                                )
-                            )
-                            installResult.append(separator)
-                        }
-                        errorTotal = errorBaseGame + errorExtension + errorOther
-                        if (errorTotal > 0) {
-                            installResult.append(separator)
-                            installResult.append(
-                                getString(
-                                    R.string.install_game_content_failed_count,
-                                    errorTotal
-                                )
-                            )
-                            installResult.append(separator)
-                            if (errorBaseGame > 0) {
-                                installResult.append(separator)
-                                installResult.append(
-                                    getString(R.string.install_game_content_failure_base)
-                                )
-                                installResult.append(separator)
-                            }
-                            if (errorExtension > 0) {
-                                installResult.append(separator)
-                                installResult.append(
-                                    getString(R.string.install_game_content_failure_file_extension)
-                                )
-                                installResult.append(separator)
-                            }
-                            if (errorOther > 0) {
-                                installResult.append(
-                                    getString(R.string.install_game_content_failure_description)
-                                )
-                                installResult.append(separator)
-                            }
-                            LongMessageDialogFragment.newInstance(
-                                R.string.install_game_content_failure,
-                                installResult.toString().trim(),
-                                R.string.install_game_content_help_link
-                            ).show(supportFragmentManager, LongMessageDialogFragment.TAG)
-                        } else {
-                            LongMessageDialogFragment.newInstance(
-                                R.string.install_game_content_success,
-                                installResult.toString().trim()
-                            ).show(supportFragmentManager, LongMessageDialogFragment.TAG)
-                        }
-                    }
-                }
-                return@newInstance installSuccess + installOverwrite + errorTotal
-            }.show(supportFragmentManager, IndeterminateProgressDialogFragment.TAG)
-        }
-    }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ControllerMappingHelper.kt

@@ -19,9 +19,7 @@ class ControllerMappingHelper {
             // The two analog triggers generate analog motion events as well as a keycode.
             // We always prefer to use the analog values, so throw away the button press
             keyCode == KeyEvent.KEYCODE_BUTTON_L2 || keyCode == KeyEvent.KEYCODE_BUTTON_R2
-        } else {
-            false
-        }
+        } else false
     }
 
     /**

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt

@@ -4,8 +4,8 @@
 package org.yuzu.yuzu_emu.utils
 
 import android.content.Context
-import java.io.IOException
 import org.yuzu.yuzu_emu.NativeLibrary
+import java.io.IOException
 
 object DirectoryInitialization {
     private var userPath: String? = null

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DocumentsTree.kt

@@ -5,10 +5,10 @@ package org.yuzu.yuzu_emu.utils
 
 import android.net.Uri
 import androidx.documentfile.provider.DocumentFile
-import java.io.File
-import java.util.*
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.model.MinimalDocumentFile
+import java.io.File
+import java.util.*
 
 class DocumentsTree {
     private var root: DocumentsNode? = null
@@ -29,20 +29,13 @@ class DocumentsTree {
         val node = resolvePath(filepath)
         return if (node == null || node.isDirectory) {
             0
-        } else {
-            FileUtil.getFileSize(YuzuApplication.appContext, node.uri.toString())
-        }
+        } else FileUtil.getFileSize(YuzuApplication.appContext, node.uri.toString())
     }
 
     fun exists(filepath: String): Boolean {
         return resolvePath(filepath) != null
     }
 
-    fun isDirectory(filepath: String): Boolean {
-        val node = resolvePath(filepath)
-        return node != null && node.isDirectory
-    }
-
     private fun resolvePath(filepath: String): DocumentsNode? {
         val tokens = StringTokenizer(filepath, File.separator, false)
         var iterator = root
@@ -113,9 +106,7 @@ class DocumentsTree {
         fun isNativePath(path: String): Boolean {
             return if (path.isNotEmpty()) {
                 path[0] == '/'
-            } else {
-                false
-            }
+            } else false
         }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt

@@ -8,6 +8,7 @@ import android.database.Cursor
 import android.net.Uri
 import android.provider.DocumentsContract
 import androidx.documentfile.provider.DocumentFile
+import org.yuzu.yuzu_emu.model.MinimalDocumentFile
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileOutputStream
@@ -16,8 +17,6 @@ import java.io.InputStream
 import java.net.URLDecoder
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
-import org.yuzu.yuzu_emu.YuzuApplication
-import org.yuzu.yuzu_emu.model.MinimalDocumentFile
 
 object FileUtil {
     const val PATH_TREE = "tree"
@@ -184,18 +183,19 @@ object FileUtil {
 
     /**
      * Get file display name from given path
-     * @param uri content uri
+     * @param path content uri path
      * @return String display name
      */
-    fun getFilename(uri: Uri): String {
-        val resolver = YuzuApplication.appContext.contentResolver
+    fun getFilename(context: Context, path: String): String {
+        val resolver = context.contentResolver
         val columns = arrayOf(
             DocumentsContract.Document.COLUMN_DISPLAY_NAME
         )
         var filename = ""
         var c: Cursor? = null
         try {
-            c = resolver.query(uri, columns, null, null, null)
+            val mUri = Uri.parse(path)
+            c = resolver.query(mUri, columns, null, null, null)
             c!!.moveToNext()
             filename = c.getString(0)
         } catch (e: Exception) {
@@ -324,9 +324,7 @@ object FileUtil {
         }
     }
 
-    fun getExtension(uri: Uri): String {
-        val fileName = getFilename(uri)
-        return fileName.substring(fileName.lastIndexOf(".") + 1)
-            .lowercase()
+    fun hasExtension(path: String, extension: String): Boolean {
+        return path.substring(path.lastIndexOf(".") + 1).contains(extension)
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ForegroundService.kt

@@ -54,7 +54,7 @@ class ForegroundService : Service() {
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         if (intent == null) {
-            return START_NOT_STICKY
+            return START_NOT_STICKY;
         }
         if (intent.action == ACTION_STOP) {
             NotificationManagerCompat.from(this).cancel(EMULATION_RUNNING_NOTIFICATION)

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt

@@ -6,11 +6,13 @@ package org.yuzu.yuzu_emu.utils
 import android.content.SharedPreferences
 import android.net.Uri
 import androidx.preference.PreferenceManager
+import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.model.Game
+import java.util.*
 
 object GameHelper {
     const val KEY_GAME_PATH = "game_path"
@@ -32,9 +34,15 @@ object GameHelper {
         val children = FileUtil.listFiles(context, gamesUri)
         for (file in children) {
             if (!file.isDirectory) {
-                // Check that the file has an extension we care about before trying to read out of it.
-                if (Game.extensions.contains(FileUtil.getExtension(file.uri))) {
-                    games.add(getGame(file.uri))
+                val filename = file.uri.toString()
+                val extensionStart = filename.lastIndexOf('.')
+                if (extensionStart > 0) {
+                    val fileExtension = filename.substring(extensionStart)
+
+                    // Check that the file has an extension we care about before trying to read out of it.
+                    if (Game.extensions.contains(fileExtension.lowercase(Locale.getDefault()))) {
+                        games.add(getGame(filename))
+                    }
                 }
             }
         }
@@ -52,19 +60,21 @@ object GameHelper {
         return games.toList()
     }
 
-    private fun getGame(uri: Uri): Game {
-        val filePath = uri.toString()
+    private fun getGame(filePath: String): Game {
         var name = NativeLibrary.getTitle(filePath)
 
         // If the game's title field is empty, use the filename.
         if (name.isEmpty()) {
-            name = FileUtil.getFilename(uri)
+            name = filePath.substring(filePath.lastIndexOf("/") + 1)
         }
         var gameId = NativeLibrary.getGameId(filePath)
 
         // If the game's ID field is empty, use the filename without extension.
         if (gameId.isEmpty()) {
-            gameId = name.substring(0, name.lastIndexOf("."))
+            gameId = filePath.substring(
+                filePath.lastIndexOf("/") + 1,
+                filePath.lastIndexOf(".")
+            )
         }
 
         val newGame = Game(
@@ -73,8 +83,7 @@ object GameHelper {
             NativeLibrary.getRegions(filePath),
             filePath,
             gameId,
-            NativeLibrary.getCompany(filePath),
-            NativeLibrary.isHomebrew(filePath)
+            NativeLibrary.getCompany(filePath)
         )
 
         val addedTime = preferences.getLong(newGame.keyAddedToLibraryTime, 0L)

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt

@@ -5,14 +5,14 @@ package org.yuzu.yuzu_emu.utils
 
 import android.content.Context
 import android.net.Uri
+import org.yuzu.yuzu_emu.NativeLibrary
+import org.yuzu.yuzu_emu.utils.FileUtil.copyUriToInternalStorage
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.io.IOException
 import java.util.zip.ZipInputStream
-import org.yuzu.yuzu_emu.NativeLibrary
-import org.yuzu.yuzu_emu.utils.FileUtil.copyUriToInternalStorage
 
 object GpuDriverHelper {
     private const val META_JSON_FILENAME = "meta.json"
@@ -113,8 +113,6 @@ object GpuDriverHelper {
         initializeDriverParameters(context)
     }
 
-    external fun supportsCustomDriverLoading(): Boolean
-
     // Parse the custom driver metadata to retrieve the name.
     val customDriverName: String?
         get() {

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverMetadata.kt

@@ -3,12 +3,12 @@
 
 package org.yuzu.yuzu_emu.utils
 
+import org.json.JSONException
+import org.json.JSONObject
 import java.io.IOException
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.Paths
-import org.json.JSONException
-import org.json.JSONObject
 
 class GpuDriverMetadata(metadataFilePath: String) {
     var name: String? = null

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt

@@ -5,8 +5,8 @@ package org.yuzu.yuzu_emu.utils
 
 import android.view.KeyEvent
 import android.view.MotionEvent
-import kotlin.math.sqrt
 import org.yuzu.yuzu_emu.NativeLibrary
+import kotlin.math.sqrt
 
 class InputHandler {
     fun initialize() {
@@ -68,11 +68,7 @@ class InputHandler {
             6 -> NativeLibrary.Player6Device
             7 -> NativeLibrary.Player7Device
             8 -> NativeLibrary.Player8Device
-            else -> if (NativeLibrary.isHandheldOnly()) {
-                NativeLibrary.ConsoleDevice
-            } else {
-                NativeLibrary.Player1Device
-            }
+            else -> if (NativeLibrary.isHandheldOnly()) NativeLibrary.ConsoleDevice else NativeLibrary.Player1Device
         }
     }
 
@@ -111,11 +107,7 @@ class InputHandler {
     }
 
     private fun getAxisToButton(axis: Float): Int {
-        return if (axis > 0.5f) {
-            NativeLibrary.ButtonState.PRESSED
-        } else {
-            NativeLibrary.ButtonState.RELEASED
-        }
+        return if (axis > 0.5f) NativeLibrary.ButtonState.PRESSED else NativeLibrary.ButtonState.RELEASED
     }
 
     private fun setAxisDpadState(playerNumber: Int, xAxis: Float, yAxis: Float) {
@@ -295,6 +287,7 @@ class InputHandler {
         }
     }
 
+
     private fun setJoyconAxisInput(event: MotionEvent, axis: Int) {
         // Joycon support is half dead. Right joystick doesn't work
         val playerNumber = getPlayerNumber(event.device.controllerNumber)
@@ -362,4 +355,6 @@ class InputHandler {
                 )
         }
     }
-}
+
+
+}

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InsetsHelper.kt

@@ -4,7 +4,9 @@
 package org.yuzu.yuzu_emu.utils
 
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.Context
+import android.graphics.Rect
 
 object InsetsHelper {
     const val THREE_BUTTON_NAVIGATION = 0
@@ -18,8 +20,12 @@ object InsetsHelper {
             resources.getIdentifier("config_navBarInteractionMode", "integer", "android")
         return if (resourceId != 0) {
             resources.getInteger(resourceId)
-        } else {
-            0
-        }
+        } else 0
+    }
+
+    fun getBottomPaddingRequired(activity: Activity): Int {
+        val visibleFrame = Rect()
+        activity.window.decorView.getWindowVisibleDisplayFrame(visibleFrame)
+        return visibleFrame.bottom - visibleFrame.top - activity.resources.displayMetrics.heightPixels
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/MemoryUtil.kt

@@ -1,59 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.utils
-
-import android.app.ActivityManager
-import android.content.Context
-import org.yuzu.yuzu_emu.R
-import java.util.Locale
-
-class MemoryUtil(val context: Context) {
-
-    private val Long.floatForm: String
-        get() = String.format(Locale.ROOT, "%.2f", this.toDouble())
-
-    private fun bytesToSizeUnit(size: Long): String {
-        return when {
-            size < Kb -> "${size.floatForm} ${context.getString(R.string.memory_byte)}"
-            size < Mb -> "${(size / Kb).floatForm} ${context.getString(R.string.memory_kilobyte)}"
-            size < Gb -> "${(size / Mb).floatForm} ${context.getString(R.string.memory_megabyte)}"
-            size < Tb -> "${(size / Gb).floatForm} ${context.getString(R.string.memory_gigabyte)}"
-            size < Pb -> "${(size / Tb).floatForm} ${context.getString(R.string.memory_terabyte)}"
-            size < Eb -> "${(size / Pb).floatForm} ${context.getString(R.string.memory_petabyte)}"
-            else -> "${(size / Eb).floatForm} ${context.getString(R.string.memory_exabyte)}"
-        }
-    }
-
-    private val totalMemory =
-        with(context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager) {
-            val memInfo = ActivityManager.MemoryInfo()
-            getMemoryInfo(memInfo)
-            memInfo.totalMem
-        }
-
-    fun isLessThan(minimum: Int, size: Long): Boolean {
-        return when (size) {
-            Kb -> totalMemory < Mb && totalMemory < minimum
-            Mb -> totalMemory < Gb && (totalMemory / Mb) < minimum
-            Gb -> totalMemory < Tb && (totalMemory / Gb) < minimum
-            Tb -> totalMemory < Pb && (totalMemory / Tb) < minimum
-            Pb -> totalMemory < Eb && (totalMemory / Pb) < minimum
-            Eb -> totalMemory / Eb < minimum
-            else -> totalMemory < Kb && totalMemory < minimum
-        }
-    }
-
-    fun getDeviceRAM(): String {
-        return bytesToSizeUnit(totalMemory)
-    }
-
-    companion object {
-        const val Kb: Long = 1024
-        const val Mb = Kb * 1024
-        const val Gb = Mb * 1024
-        const val Tb = Gb * 1024
-        const val Pb = Tb * 1024
-        const val Eb = Pb * 1024
-    }
-}

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NfcReader.kt

@@ -13,8 +13,8 @@ import android.nfc.tech.NfcA
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
-import java.io.IOException
 import org.yuzu.yuzu_emu.NativeLibrary
+import java.io.IOException
 
 class NfcReader(private val activity: Activity) {
     private var nfcAdapter: NfcAdapter? = null
@@ -25,13 +25,10 @@ class NfcReader(private val activity: Activity) {
 
         pendingIntent = PendingIntent.getActivity(
             activity,
-            0,
-            Intent(activity, activity.javaClass),
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            0, Intent(activity, activity.javaClass),
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
                 PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_MUTABLE
-            } else {
-                PendingIntent.FLAG_UPDATE_CURRENT
-            }
+            else PendingIntent.FLAG_UPDATE_CURRENT
         )
 
         val tagDetected = IntentFilter(NfcAdapter.ACTION_TAG_DISCOVERED)
@@ -48,9 +45,9 @@ class NfcReader(private val activity: Activity) {
 
     fun onNewIntent(intent: Intent) {
         val action = intent.action
-        if (NfcAdapter.ACTION_TAG_DISCOVERED != action &&
-            NfcAdapter.ACTION_TECH_DISCOVERED != action &&
-            NfcAdapter.ACTION_NDEF_DISCOVERED != action
+        if (NfcAdapter.ACTION_TAG_DISCOVERED != action
+            && NfcAdapter.ACTION_TECH_DISCOVERED != action
+            && NfcAdapter.ACTION_NDEF_DISCOVERED != action
         ) {
             return
         }
@@ -87,7 +84,7 @@ class NfcReader(private val activity: Activity) {
     }
 
     private fun ntag215ReadAll(amiibo: NfcA): ByteArray? {
-        val bufferSize = amiibo.maxTransceiveLength
+        val bufferSize = amiibo.maxTransceiveLength;
         val tagSize = 0x21C
         val pageSize = 4
         val lastPage = tagSize / pageSize - 1
@@ -106,7 +103,7 @@ class NfcReader(private val activity: Activity) {
                 val data = ntag215FastRead(amiibo, dataStart, dataEnd - 1)
                 System.arraycopy(data, 0, tagData, i, (dataEnd - dataStart) * pageSize)
             } catch (e: IOException) {
-                return null
+                return null;
             }
         }
         return tagData

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/SerializableHelper.kt

@@ -11,34 +11,30 @@ import java.io.Serializable
 
 object SerializableHelper {
     inline fun <reified T : Serializable> Bundle.serializable(key: String): T? {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
             getSerializable(key, T::class.java)
-        } else {
+        else
             getSerializable(key) as? T
-        }
     }
 
     inline fun <reified T : Serializable> Intent.serializable(key: String): T? {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
             getSerializableExtra(key, T::class.java)
-        } else {
+        else
             getSerializableExtra(key) as? T
-        }
     }
 
     inline fun <reified T : Parcelable> Bundle.parcelable(key: String): T? {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
             getParcelable(key, T::class.java)
-        } else {
+        else
             getParcelable(key) as? T
-        }
     }
 
     inline fun <reified T : Parcelable> Intent.parcelable(key: String): T? {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
             getParcelableExtra(key, T::class.java)
-        } else {
+        else
             getParcelableExtra(key) as? T
-        }
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/ThemeHelper.kt

@@ -3,19 +3,21 @@
 
 package org.yuzu.yuzu_emu.utils
 
+import android.app.Activity
 import android.content.res.Configuration
 import android.graphics.Color
 import androidx.annotation.ColorInt
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.ContextCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.preference.PreferenceManager
-import kotlin.math.roundToInt
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.ui.main.ThemeProvider
+import kotlin.math.roundToInt
 
 object ThemeHelper {
     const val SYSTEM_BAR_ALPHA = 0.9f
@@ -34,8 +36,8 @@ object ThemeHelper {
         // Using a specific night mode check because this could apply incorrectly when using the
         // light app mode, dark system mode, and black backgrounds. Launching the settings activity
         // will then show light mode colors/navigation bars but with black backgrounds.
-        if (preferences.getBoolean(Settings.PREF_BLACK_BACKGROUNDS, false) &&
-            isNightMode(activity)
+        if (preferences.getBoolean(Settings.PREF_BLACK_BACKGROUNDS, false)
+            && isNightMode(activity)
         ) {
             activity.setTheme(R.style.ThemeOverlay_Yuzu_Dark)
         }
@@ -44,10 +46,8 @@ object ThemeHelper {
     @ColorInt
     fun getColorWithOpacity(@ColorInt color: Int, alphaFactor: Float): Int {
         return Color.argb(
-            (alphaFactor * Color.alpha(color)).roundToInt(),
-            Color.red(color),
-            Color.green(color),
-            Color.blue(color)
+            (alphaFactor * Color.alpha(color)).roundToInt(), Color.red(color),
+            Color.green(color), Color.blue(color)
         )
     }
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/views/FixedRatioSurfaceView.kt

@@ -1,48 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.views
-
-import android.content.Context
-import android.util.AttributeSet
-import android.util.Rational
-import android.view.SurfaceView
-import kotlin.math.roundToInt
-
-class FixedRatioSurfaceView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : SurfaceView(context, attrs, defStyleAttr) {
-    private var aspectRatio: Float = 0f // (width / height), 0f is a special value for stretch
-
-    /**
-     * Sets the desired aspect ratio for this view
-     * @param ratio the ratio to force the view to, or null to stretch to fit
-     */
-    fun setAspectRatio(ratio: Rational?) {
-        aspectRatio = ratio?.toFloat() ?: 0f
-    }
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
-        val width = MeasureSpec.getSize(widthMeasureSpec)
-        val height = MeasureSpec.getSize(heightMeasureSpec)
-        if (aspectRatio != 0f) {
-            val newWidth: Int
-            val newHeight: Int
-            if (height * aspectRatio < width) {
-                newWidth = (height * aspectRatio).roundToInt()
-                newHeight = height
-            } else {
-                newWidth = width
-                newHeight = (width / aspectRatio).roundToInt()
-            }
-            val left = (width - newWidth) / 2
-            val top = (height - newHeight) / 2
-            setLeftTopRightBottom(left, top, left + newWidth, top + newHeight)
-        } else {
-            setLeftTopRightBottom(0, 0, width, height)
-        }
-    }
-}

src/android/app/src/main/jni/CMakeLists.txt

@@ -14,6 +14,7 @@ add_library(yuzu-android SHARED
     id_cache.cpp
     id_cache.h
     native.cpp
+    native.h
 )
 
 set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR})

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

@@ -235,13 +235,9 @@ void Config::ReadValues() {
     Settings::values.async_presentation =
         config->GetBoolean("Renderer", "async_presentation", true);
 
-    // Disable force_max_clock by default on Android
+    // Enable force_max_clock by default on Android
     Settings::values.renderer_force_max_clock =
-        config->GetBoolean("Renderer", "force_max_clock", false);
-
-    // Disable use_reactive_flushing by default on Android
-    Settings::values.use_reactive_flushing =
-        config->GetBoolean("Renderer", "use_reactive_flushing", false);
+        config->GetBoolean("Renderer", "force_max_clock", true);
 
     // Audio
     ReadSetting("Audio", Settings::values.sink_id);

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

@@ -251,7 +251,7 @@ backend =
 # 0: Off, 1 (default): On
 async_presentation =
 
-# Forces the GPU to run at the maximum possible clocks (thermal constraints will still be applied).
+# Enable graphics API debugging mode.
 # 0 (default): Disabled, 1: Enabled
 force_max_clock =
 
@@ -328,10 +328,6 @@ shader_backend =
 # 0 (default): Off, 1: On
 use_asynchronous_shaders =
 
-# Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory.
-# 0 (default): Off, 1: On
-use_reactive_flushing =
-
 # NVDEC emulation.
 # 0: Disabled, 1: CPU Decoding, 2 (default): GPU Decoding
 nvdec_emulation =

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

@@ -13,8 +13,6 @@
 
 #include <android/api-level.h>
 #include <android/native_window_jni.h>
-#include <core/loader/nro.h>
-#include <jni.h>
 
 #include "common/detached_tasks.h"
 #include "common/dynamic_library.h"
@@ -29,10 +27,7 @@
 #include "core/core.h"
 #include "core/cpu_manager.h"
 #include "core/crypto/key_manager.h"
-#include "core/file_sys/card_image.h"
 #include "core/file_sys/registered_cache.h"
-#include "core/file_sys/submission_package.h"
-#include "core/file_sys/vfs.h"
 #include "core/file_sys/vfs_real.h"
 #include "core/frontend/applets/cabinet.h"
 #include "core/frontend/applets/controller.h"
@@ -60,9 +55,6 @@
 #include "video_core/rasterizer_interface.h"
 #include "video_core/renderer_base.h"
 
-#define jconst [[maybe_unused]] const auto
-#define jauto [[maybe_unused]] auto
-
 namespace {
 
 class EmulationSession final {
@@ -101,72 +93,12 @@ public:
         m_native_window = native_window;
     }
 
-    int InstallFileToNand(std::string filename) {
-        jconst copy_func = [](const FileSys::VirtualFile& src, const FileSys::VirtualFile& dest,
-                              std::size_t block_size) {
-            if (src == nullptr || dest == nullptr) {
-                return false;
-            }
-            if (!dest->Resize(src->GetSize())) {
-                return false;
-            }
+    u32 ScreenRotation() const {
+        return m_screen_rotation;
+    }
 
-            using namespace Common::Literals;
-            [[maybe_unused]] std::vector<u8> buffer(1_MiB);
-
-            for (std::size_t i = 0; i < src->GetSize(); i += buffer.size()) {
-                jconst read = src->Read(buffer.data(), buffer.size(), i);
-                dest->Write(buffer.data(), read, i);
-            }
-            return true;
-        };
-
-        enum InstallResult {
-            Success = 0,
-            SuccessFileOverwritten = 1,
-            InstallError = 2,
-            ErrorBaseGame = 3,
-            ErrorFilenameExtension = 4,
-        };
-
-        m_system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
-        m_system.GetFileSystemController().CreateFactories(*m_vfs);
-
-        [[maybe_unused]] std::shared_ptr<FileSys::NSP> nsp;
-        if (filename.ends_with("nsp")) {
-            nsp = std::make_shared<FileSys::NSP>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
-            if (nsp->IsExtractedType()) {
-                return InstallError;
-            }
-        } else if (filename.ends_with("xci")) {
-            jconst xci =
-                std::make_shared<FileSys::XCI>(m_vfs->OpenFile(filename, FileSys::Mode::Read));
-            nsp = xci->GetSecurePartitionNSP();
-        } else {
-            return ErrorFilenameExtension;
-        }
-
-        if (!nsp) {
-            return InstallError;
-        }
-
-        if (nsp->GetStatus() != Loader::ResultStatus::Success) {
-            return InstallError;
-        }
-
-        jconst res = m_system.GetFileSystemController().GetUserNANDContents()->InstallEntry(
-            *nsp, true, copy_func);
-
-        switch (res) {
-        case FileSys::InstallResult::Success:
-            return Success;
-        case FileSys::InstallResult::OverwriteExisting:
-            return SuccessFileOverwritten;
-        case FileSys::InstallResult::ErrorBaseInstall:
-            return ErrorBaseGame;
-        default:
-            return InstallError;
-        }
+    void SetScreenRotation(u32 screen_rotation) {
+        m_screen_rotation = screen_rotation;
     }
 
     void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& custom_driver_dir,
@@ -206,11 +138,6 @@ public:
         return m_is_running;
     }
 
-    bool IsPaused() const {
-        std::scoped_lock lock(m_mutex);
-        return m_is_running && m_is_paused;
-    }
-
     const Core::PerfStatsResults& PerfStats() const {
         std::scoped_lock m_perf_stats_lock(m_perf_stats_mutex);
         return m_perf_stats;
@@ -234,15 +161,14 @@ public:
         m_window = std::make_unique<EmuWindow_Android>(&m_input_subsystem, m_native_window,
                                                        m_vulkan_library);
 
-        m_system.SetFilesystem(m_vfs);
-
         // Initialize system.
-        jauto android_keyboard = std::make_unique<SoftwareKeyboard::AndroidKeyboard>();
+        auto android_keyboard = std::make_unique<SoftwareKeyboard::AndroidKeyboard>();
         m_software_keyboard = android_keyboard.get();
         m_system.SetShuttingDown(false);
         m_system.ApplySettings();
-        Settings::LogSettings();
         m_system.HIDCore().ReloadInputDevices();
+        m_system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
+        m_system.SetFilesystem(std::make_shared<FileSys::RealVfsFilesystem>());
         m_system.SetAppletFrontendSet({
             nullptr,                     // Amiibo Settings
             nullptr,                     // Controller Selector
@@ -254,8 +180,7 @@ public:
             std::move(android_keyboard), // Software Keyboard
             nullptr,                     // Web Browser
         });
-        m_system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
-        m_system.GetFileSystemController().CreateFactories(*m_vfs);
+        m_system.GetFileSystemController().CreateFactories(*m_system.GetFilesystem());
 
         // Initialize account manager
         m_profile_manager = std::make_unique<Service::Account::ProfileManager>();
@@ -297,13 +222,11 @@ public:
     void PauseEmulation() {
         std::scoped_lock lock(m_mutex);
         m_system.Pause();
-        m_is_paused = true;
     }
 
     void UnPauseEmulation() {
         std::scoped_lock lock(m_mutex);
         m_system.Run();
-        m_is_paused = false;
     }
 
     void HaltEmulation() {
@@ -335,7 +258,7 @@ public:
 
         while (true) {
             {
-                [[maybe_unused]] std::unique_lock lock(m_mutex);
+                std::unique_lock lock(m_mutex);
                 if (m_cv.wait_for(lock, std::chrono::milliseconds(800),
                                   [&]() { return !m_is_running; })) {
                     // Emulation halted.
@@ -358,16 +281,12 @@ public:
         return GetRomMetadata(path).icon;
     }
 
-    bool GetIsHomebrew(const std::string& path) {
-        return GetRomMetadata(path).isHomebrew;
-    }
-
     void ResetRomMetadata() {
         m_rom_metadata_cache.clear();
     }
 
     bool IsHandheldOnly() {
-        jconst npad_style_set = m_system.HIDCore().GetSupportedStyleTag();
+        const auto npad_style_set = m_system.HIDCore().GetSupportedStyleTag();
 
         if (npad_style_set.fullkey == 1) {
             return false;
@@ -380,17 +299,17 @@ public:
         return !Settings::values.use_docked_mode.GetValue();
     }
 
-    void SetDeviceType([[maybe_unused]] int index, int type) {
-        jauto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);
+    void SetDeviceType(int index, int type) {
+        auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);
         controller->SetNpadStyleIndex(static_cast<Core::HID::NpadStyleIndex>(type));
     }
 
-    void OnGamepadConnectEvent([[maybe_unused]] int index) {
-        jauto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);
+    void OnGamepadConnectEvent(int index) {
+        auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);
 
         // Ensure that player1 is configured correctly and handheld disconnected
         if (controller->GetNpadIdType() == Core::HID::NpadIdType::Player1) {
-            jauto handheld =
+            auto handheld =
                 m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);
 
             if (controller->GetNpadStyleIndex() == Core::HID::NpadStyleIndex::Handheld) {
@@ -402,8 +321,7 @@ public:
 
         // Ensure that handheld is configured correctly and player 1 disconnected
         if (controller->GetNpadIdType() == Core::HID::NpadIdType::Handheld) {
-            jauto player1 =
-                m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1);
+            auto player1 = m_system.HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1);
 
             if (controller->GetNpadStyleIndex() != Core::HID::NpadStyleIndex::Handheld) {
                 player1->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld);
@@ -417,8 +335,8 @@ public:
         }
     }
 
-    void OnGamepadDisconnectEvent([[maybe_unused]] int index) {
-        jauto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);
+    void OnGamepadDisconnectEvent(int index) {
+        auto controller = m_system.HIDCore().GetEmulatedControllerByIndex(index);
         controller->Disconnect();
     }
 
@@ -430,11 +348,10 @@ private:
     struct RomMetadata {
         std::string title;
         std::vector<u8> icon;
-        bool isHomebrew;
     };
 
     RomMetadata GetRomMetadata(const std::string& path) {
-        if (jauto search = m_rom_metadata_cache.find(path); search != m_rom_metadata_cache.end()) {
+        if (auto search = m_rom_metadata_cache.find(path); search != m_rom_metadata_cache.end()) {
             return search->second;
         }
 
@@ -442,18 +359,12 @@ private:
     }
 
     RomMetadata CacheRomMetadata(const std::string& path) {
-        jconst file = Core::GetGameFileFromPath(m_vfs, path);
-        jauto loader = Loader::GetLoader(EmulationSession::GetInstance().System(), file, 0, 0);
+        const auto file = Core::GetGameFileFromPath(m_vfs, path);
+        const auto loader = Loader::GetLoader(EmulationSession::GetInstance().System(), file, 0, 0);
 
         RomMetadata entry;
         loader->ReadTitle(entry.title);
         loader->ReadIcon(entry.icon);
-        if (loader->GetFileType() == Loader::FileType::NRO) {
-            jauto loader_nro = dynamic_cast<Loader::AppLoader_NRO*>(loader.get());
-            entry.isHomebrew = loader_nro->IsHomebrew();
-        } else {
-            entry.isHomebrew = false;
-        }
 
         m_rom_metadata_cache[path] = entry;
 
@@ -477,16 +388,16 @@ private:
     // Window management
     std::unique_ptr<EmuWindow_Android> m_window;
     ANativeWindow* m_native_window{};
+    u32 m_screen_rotation{};
 
     // Core emulation
     Core::System m_system;
     InputCommon::InputSubsystem m_input_subsystem;
     Common::DetachedTasks m_detached_tasks;
     Core::PerfStatsResults m_perf_stats{};
-    std::shared_ptr<FileSys::VfsFilesystem> m_vfs;
+    std::shared_ptr<FileSys::RealVfsFilesystem> m_vfs;
     Core::SystemResultStatus m_load_result{Core::SystemResultStatus::ErrorNotInitialized};
     bool m_is_running{};
-    bool m_is_paused{};
     SoftwareKeyboard::AndroidKeyboard* m_software_keyboard{};
     std::unique_ptr<Service::Account::ProfileManager> m_profile_manager;
 
@@ -503,6 +414,10 @@ private:
 
 } // Anonymous namespace
 
+u32 GetAndroidScreenRotation() {
+    return EmulationSession::GetInstance().ScreenRotation();
+}
+
 static Core::SystemResultStatus RunEmulation(const std::string& filepath) {
     Common::Log::Initialize();
     Common::Log::SetColorConsoleBackendEnabled(true);
@@ -520,7 +435,7 @@ static Core::SystemResultStatus RunEmulation(const std::string& filepath) {
 
     SCOPE_EXIT({ EmulationSession::GetInstance().ShutdownEmulation(); });
 
-    jconst result = EmulationSession::GetInstance().InitializeEmulation(filepath);
+    const auto result = EmulationSession::GetInstance().InitializeEmulation(filepath);
     if (result != Core::SystemResultStatus::Success) {
         return result;
     }
@@ -532,104 +447,79 @@ static Core::SystemResultStatus RunEmulation(const std::string& filepath) {
 
 extern "C" {
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env, jobject instance,
-                                                          [[maybe_unused]] jobject surf) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceChanged(JNIEnv* env,
+                                                          [[maybe_unused]] jclass clazz,
+                                                          jobject surf) {
     EmulationSession::GetInstance().SetNativeWindow(ANativeWindow_fromSurface(env, surf));
     EmulationSession::GetInstance().SurfaceChanged();
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceDestroyed(JNIEnv* env, jobject instance) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_surfaceDestroyed(JNIEnv* env,
+                                                            [[maybe_unused]] jclass clazz) {
     ANativeWindow_release(EmulationSession::GetInstance().NativeWindow());
     EmulationSession::GetInstance().SetNativeWindow(nullptr);
     EmulationSession::GetInstance().SurfaceChanged();
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env, jobject instance,
-                                                           [[maybe_unused]] jstring j_directory) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_notifyOrientationChange(JNIEnv* env,
+                                                                   [[maybe_unused]] jclass clazz,
+                                                                   jint layout_option,
+                                                                   jint rotation) {
+    return EmulationSession::GetInstance().SetScreenRotation(static_cast<u32>(rotation));
+}
+
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_setAppDirectory(JNIEnv* env,
+                                                           [[maybe_unused]] jclass clazz,
+                                                           jstring j_directory) {
     Common::FS::SetAppDirectory(GetJString(env, j_directory));
 }
 
-int Java_org_yuzu_yuzu_1emu_NativeLibrary_installFileToNand(JNIEnv* env, jobject instance,
-                                                            [[maybe_unused]] jstring j_file) {
-    return EmulationSession::GetInstance().InstallFileToNand(GetJString(env, j_file));
-}
-
-void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz,
-                                                                       jstring hook_lib_dir,
-                                                                       jstring custom_driver_dir,
-                                                                       jstring custom_driver_name,
-                                                                       jstring file_redirect_dir) {
+void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(
+    JNIEnv* env, [[maybe_unused]] jclass clazz, jstring hook_lib_dir, jstring custom_driver_dir,
+    jstring custom_driver_name, jstring file_redirect_dir) {
     EmulationSession::GetInstance().InitializeGpuDriver(
         GetJString(env, hook_lib_dir), GetJString(env, custom_driver_dir),
         GetJString(env, custom_driver_name), GetJString(env, file_redirect_dir));
 }
 
-[[maybe_unused]] static bool CheckKgslPresent() {
-    constexpr auto KgslPath{"/dev/kgsl-3d0"};
-
-    return access(KgslPath, F_OK) == 0;
-}
-
-[[maybe_unused]] bool SupportsCustomDriver() {
-    return android_get_device_api_level() >= 28 && CheckKgslPresent();
-}
-
-jboolean JNICALL Java_org_yuzu_yuzu_1emu_utils_GpuDriverHelper_supportsCustomDriverLoading(
-    JNIEnv* env, jobject instance) {
-#ifdef ARCHITECTURE_arm64
-    // If the KGSL device exists custom drivers can be loaded using adrenotools
-    return SupportsCustomDriver();
-#else
-    return false;
-#endif
-}
-
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadKeys(JNIEnv* env, jclass clazz) {
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadKeys(JNIEnv* env,
+                                                          [[maybe_unused]] jclass clazz) {
     Core::Crypto::KeyManager::Instance().ReloadKeys();
     return static_cast<jboolean>(Core::Crypto::KeyManager::Instance().AreKeysLoaded());
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_unpauseEmulation(JNIEnv* env, jclass clazz) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_unPauseEmulation([[maybe_unused]] JNIEnv* env,
+                                                            [[maybe_unused]] jclass clazz) {
     EmulationSession::GetInstance().UnPauseEmulation();
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_pauseEmulation(JNIEnv* env, jclass clazz) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_pauseEmulation([[maybe_unused]] JNIEnv* env,
+                                                          [[maybe_unused]] jclass clazz) {
     EmulationSession::GetInstance().PauseEmulation();
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_stopEmulation(JNIEnv* env, jclass clazz) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_stopEmulation([[maybe_unused]] JNIEnv* env,
+                                                         [[maybe_unused]] jclass clazz) {
     EmulationSession::GetInstance().HaltEmulation();
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_resetRomMetadata(JNIEnv* env, jclass clazz) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_resetRomMetadata([[maybe_unused]] JNIEnv* env,
+                                                            [[maybe_unused]] jclass clazz) {
     EmulationSession::GetInstance().ResetRomMetadata();
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isRunning(JNIEnv* env, jclass clazz) {
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isRunning([[maybe_unused]] JNIEnv* env,
+                                                         [[maybe_unused]] jclass clazz) {
     return static_cast<jboolean>(EmulationSession::GetInstance().IsRunning());
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isPaused(JNIEnv* env, jclass clazz) {
-    return static_cast<jboolean>(EmulationSession::GetInstance().IsPaused());
-}
-
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_muteAduio(JNIEnv* env, jclass clazz) {
-    Settings::values.audio_muted = true;
-}
-
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_unmuteAudio(JNIEnv* env, jclass clazz) {
-    Settings::values.audio_muted = false;
-}
-
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isMuted(JNIEnv* env, jclass clazz) {
-    return static_cast<jboolean>(Settings::values.audio_muted.GetValue());
-}
-
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly(JNIEnv* env, jclass clazz) {
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly([[maybe_unused]] JNIEnv* env,
+                                                              [[maybe_unused]] jclass clazz) {
     return EmulationSession::GetInstance().IsHandheldOnly();
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType(JNIEnv* env, jclass clazz,
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType([[maybe_unused]] JNIEnv* env,
+                                                             [[maybe_unused]] jclass clazz,
                                                              jint j_device, jint j_type) {
     if (EmulationSession::GetInstance().IsRunning()) {
         EmulationSession::GetInstance().SetDeviceType(j_device, j_type);
@@ -637,7 +527,8 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType(JNIEnv* env, jclass
     return static_cast<jboolean>(true);
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent(JNIEnv* env, jclass clazz,
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent([[maybe_unused]] JNIEnv* env,
+                                                                     [[maybe_unused]] jclass clazz,
                                                                      jint j_device) {
     if (EmulationSession::GetInstance().IsRunning()) {
         EmulationSession::GetInstance().OnGamepadConnectEvent(j_device);
@@ -645,16 +536,17 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent(JNIEnv* env
     return static_cast<jboolean>(true);
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent(JNIEnv* env, jclass clazz,
-                                                                        jint j_device) {
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent(
+    [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint j_device) {
     if (EmulationSession::GetInstance().IsRunning()) {
         EmulationSession::GetInstance().OnGamepadDisconnectEvent(j_device);
     }
     return static_cast<jboolean>(true);
 }
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadButtonEvent(JNIEnv* env, jclass clazz,
-                                                                    jint j_device, jint j_button,
-                                                                    jint action) {
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadButtonEvent([[maybe_unused]] JNIEnv* env,
+                                                                    [[maybe_unused]] jclass clazz,
+                                                                    [[maybe_unused]] jint j_device,
+                                                                    jint j_button, jint action) {
     if (EmulationSession::GetInstance().IsRunning()) {
         // Ensure gamepad is connected
         EmulationSession::GetInstance().OnGamepadConnectEvent(j_device);
@@ -664,7 +556,8 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadButtonEvent(JNIEnv* env,
     return static_cast<jboolean>(true);
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadJoystickEvent(JNIEnv* env, jclass clazz,
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadJoystickEvent([[maybe_unused]] JNIEnv* env,
+                                                                      [[maybe_unused]] jclass clazz,
                                                                       jint j_device, jint stick_id,
                                                                       jfloat x, jfloat y) {
     if (EmulationSession::GetInstance().IsRunning()) {
@@ -674,8 +567,9 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadJoystickEvent(JNIEnv* en
 }
 
 jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadMotionEvent(
-    JNIEnv* env, jclass clazz, jint j_device, jlong delta_timestamp, jfloat gyro_x, jfloat gyro_y,
-    jfloat gyro_z, jfloat accel_x, jfloat accel_y, jfloat accel_z) {
+    [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jint j_device,
+    jlong delta_timestamp, jfloat gyro_x, jfloat gyro_y, jfloat gyro_z, jfloat accel_x,
+    jfloat accel_y, jfloat accel_z) {
     if (EmulationSession::GetInstance().IsRunning()) {
         EmulationSession::GetInstance().Window().OnGamepadMotionEvent(
             j_device, delta_timestamp, gyro_x, gyro_y, gyro_z, accel_x, accel_y, accel_z);
@@ -683,7 +577,8 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadMotionEvent(
     return static_cast<jboolean>(true);
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag(JNIEnv* env, jclass clazz,
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag([[maybe_unused]] JNIEnv* env,
+                                                            [[maybe_unused]] jclass clazz,
                                                             jbyteArray j_data) {
     jboolean isCopy{false};
     std::span<u8> data(reinterpret_cast<u8*>(env->GetByteArrayElements(j_data, &isCopy)),
@@ -695,92 +590,102 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag(JNIEnv* env, jclass
     return static_cast<jboolean>(true);
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag(JNIEnv* env, jclass clazz) {
+jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag([[maybe_unused]] JNIEnv* env,
+                                                              [[maybe_unused]] jclass clazz) {
     if (EmulationSession::GetInstance().IsRunning()) {
         EmulationSession::GetInstance().Window().OnRemoveNfcTag();
     }
     return static_cast<jboolean>(true);
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchPressed(JNIEnv* env, jclass clazz, jint id,
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchPressed([[maybe_unused]] JNIEnv* env,
+                                                          [[maybe_unused]] jclass clazz, jint id,
                                                           jfloat x, jfloat y) {
     if (EmulationSession::GetInstance().IsRunning()) {
         EmulationSession::GetInstance().Window().OnTouchPressed(id, x, y);
     }
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchMoved(JNIEnv* env, jclass clazz, jint id,
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchMoved([[maybe_unused]] JNIEnv* env,
+                                                        [[maybe_unused]] jclass clazz, jint id,
                                                         jfloat x, jfloat y) {
     if (EmulationSession::GetInstance().IsRunning()) {
         EmulationSession::GetInstance().Window().OnTouchMoved(id, x, y);
     }
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchReleased(JNIEnv* env, jclass clazz, jint id) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchReleased([[maybe_unused]] JNIEnv* env,
+                                                           [[maybe_unused]] jclass clazz, jint id) {
     if (EmulationSession::GetInstance().IsRunning()) {
         EmulationSession::GetInstance().Window().OnTouchReleased(id);
     }
 }
 
-jbyteArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getIcon(JNIEnv* env, jclass clazz,
-                                                         jstring j_filename) {
-    jauto icon_data = EmulationSession::GetInstance().GetRomIcon(GetJString(env, j_filename));
+jbyteArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getIcon([[maybe_unused]] JNIEnv* env,
+                                                         [[maybe_unused]] jclass clazz,
+                                                         [[maybe_unused]] jstring j_filename) {
+    auto icon_data = EmulationSession::GetInstance().GetRomIcon(GetJString(env, j_filename));
     jbyteArray icon = env->NewByteArray(static_cast<jsize>(icon_data.size()));
     env->SetByteArrayRegion(icon, 0, env->GetArrayLength(icon),
                             reinterpret_cast<jbyte*>(icon_data.data()));
     return icon;
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getTitle(JNIEnv* env, jclass clazz,
-                                                       jstring j_filename) {
-    jauto title = EmulationSession::GetInstance().GetRomTitle(GetJString(env, j_filename));
+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getTitle([[maybe_unused]] JNIEnv* env,
+                                                       [[maybe_unused]] jclass clazz,
+                                                       [[maybe_unused]] jstring j_filename) {
+    auto title = EmulationSession::GetInstance().GetRomTitle(GetJString(env, j_filename));
     return env->NewStringUTF(title.c_str());
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getDescription(JNIEnv* env, jclass clazz,
+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getDescription([[maybe_unused]] JNIEnv* env,
+                                                             [[maybe_unused]] jclass clazz,
                                                              jstring j_filename) {
     return j_filename;
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGameId(JNIEnv* env, jclass clazz,
+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getGameId([[maybe_unused]] JNIEnv* env,
+                                                        [[maybe_unused]] jclass clazz,
                                                         jstring j_filename) {
     return j_filename;
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getRegions(JNIEnv* env, jclass clazz,
-                                                         jstring j_filename) {
+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getRegions([[maybe_unused]] JNIEnv* env,
+                                                         [[maybe_unused]] jclass clazz,
+                                                         [[maybe_unused]] jstring j_filename) {
     return env->NewStringUTF("");
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCompany(JNIEnv* env, jclass clazz,
-                                                         jstring j_filename) {
+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getCompany([[maybe_unused]] JNIEnv* env,
+                                                         [[maybe_unused]] jclass clazz,
+                                                         [[maybe_unused]] jstring j_filename) {
     return env->NewStringUTF("");
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHomebrew(JNIEnv* env, jclass clazz,
-                                                          jstring j_filename) {
-    return EmulationSession::GetInstance().GetIsHomebrew(GetJString(env, j_filename));
-}
-
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeEmulation(JNIEnv* env, jclass clazz) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeEmulation
+    [[maybe_unused]] (JNIEnv* env, [[maybe_unused]] jclass clazz) {
     // Create the default config.ini.
     Config{};
     // Initialize the emulated system.
     EmulationSession::GetInstance().System().Initialize();
 }
 
-jint Java_org_yuzu_yuzu_1emu_NativeLibrary_defaultCPUCore(JNIEnv* env, jclass clazz) {
+jint Java_org_yuzu_yuzu_1emu_NativeLibrary_defaultCPUCore([[maybe_unused]] JNIEnv* env,
+                                                          [[maybe_unused]] jclass clazz) {
     return {};
 }
 
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_run__Ljava_lang_String_2Ljava_lang_String_2Z(
-    JNIEnv* env, jclass clazz, jstring j_file, jstring j_savestate, jboolean j_delete_savestate) {}
+    [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, [[maybe_unused]] jstring j_file,
+    [[maybe_unused]] jstring j_savestate, [[maybe_unused]] jboolean j_delete_savestate) {}
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadSettings(JNIEnv* env, jclass clazz) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadSettings([[maybe_unused]] JNIEnv* env,
+                                                          [[maybe_unused]] jclass clazz) {
     Config{};
 }
 
-jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getUserSetting(JNIEnv* env, jclass clazz,
+jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getUserSetting([[maybe_unused]] JNIEnv* env,
+                                                             [[maybe_unused]] jclass clazz,
                                                              jstring j_game_id, jstring j_section,
                                                              jstring j_key) {
     std::string_view game_id = env->GetStringUTFChars(j_game_id, 0);
@@ -794,7 +699,8 @@ jstring Java_org_yuzu_yuzu_1emu_NativeLibrary_getUserSetting(JNIEnv* env, jclass
     return env->NewStringUTF("");
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_setUserSetting(JNIEnv* env, jclass clazz,
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_setUserSetting([[maybe_unused]] JNIEnv* env,
+                                                          [[maybe_unused]] jclass clazz,
                                                           jstring j_game_id, jstring j_section,
                                                           jstring j_key, jstring j_value) {
     std::string_view game_id = env->GetStringUTFChars(j_game_id, 0);
@@ -808,18 +714,20 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_setUserSetting(JNIEnv* env, jclass cl
     env->ReleaseStringUTFChars(j_value, value.data());
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_initGameIni(JNIEnv* env, jclass clazz,
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_initGameIni([[maybe_unused]] JNIEnv* env,
+                                                       [[maybe_unused]] jclass clazz,
                                                        jstring j_game_id) {
     std::string_view game_id = env->GetStringUTFChars(j_game_id, 0);
 
     env->ReleaseStringUTFChars(j_game_id, game_id.data());
 }
 
-jdoubleArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPerfStats(JNIEnv* env, jclass clazz) {
+jdoubleArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPerfStats([[maybe_unused]] JNIEnv* env,
+                                                                [[maybe_unused]] jclass clazz) {
     jdoubleArray j_stats = env->NewDoubleArray(4);
 
     if (EmulationSession::GetInstance().IsRunning()) {
-        jconst results = EmulationSession::GetInstance().PerfStats();
+        const auto results = EmulationSession::GetInstance().PerfStats();
 
         // Converting the structure into an array makes it easier to pass it to the frontend
         double stats[4] = {results.system_fps, results.average_game_fps, results.frametime,
@@ -831,11 +739,11 @@ jdoubleArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPerfStats(JNIEnv* env, jcl
     return j_stats;
 }
 
-void Java_org_yuzu_yuzu_1emu_utils_DirectoryInitialization_setSysDirectory(JNIEnv* env,
-                                                                           jclass clazz,
-                                                                           jstring j_path) {}
+void Java_org_yuzu_yuzu_1emu_utils_DirectoryInitialization_setSysDirectory(
+    [[maybe_unused]] JNIEnv* env, [[maybe_unused]] jclass clazz, jstring j_path) {}
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_run__Ljava_lang_String_2(JNIEnv* env, jclass clazz,
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_run__Ljava_lang_String_2([[maybe_unused]] JNIEnv* env,
+                                                                    [[maybe_unused]] jclass clazz,
                                                                     jstring j_path) {
     const std::string path = GetJString(env, j_path);
 
@@ -846,7 +754,8 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_run__Ljava_lang_String_2(JNIEnv* env,
     }
 }
 
-void Java_org_yuzu_yuzu_1emu_NativeLibrary_logDeviceInfo(JNIEnv* env, jclass clazz) {
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_logDeviceInfo([[maybe_unused]] JNIEnv* env,
+                                                         [[maybe_unused]] jclass clazz) {
     LOG_INFO(Frontend, "yuzu Version: {}-{}", Common::g_scm_branch, Common::g_scm_desc);
     LOG_INFO(Frontend, "Host OS: Android API level {}", android_get_device_api_level());
 }

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

@@ -0,0 +1,165 @@
+// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <jni.h>
+
+// Function calls from the Java side
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_UnPauseEmulation(JNIEnv* env,
+                                                                              jclass clazz);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_PauseEmulation(JNIEnv* env,
+                                                                            jclass clazz);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_StopEmulation(JNIEnv* env,
+                                                                           jclass clazz);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_ResetRomMetadata(JNIEnv* env,
+                                                                              jclass clazz);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_IsRunning(JNIEnv* env,
+                                                                           jclass clazz);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly(JNIEnv* env,
+                                                                                jclass clazz);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_setDeviceType(JNIEnv* env,
+                                                                               jclass clazz,
+                                                                               jstring j_device,
+                                                                               jstring j_type);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadConnectEvent(
+    JNIEnv* env, jclass clazz, jstring j_device);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadDisconnectEvent(
+    JNIEnv* env, jclass clazz, jstring j_device);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadEvent(
+    JNIEnv* env, jclass clazz, jstring j_device, jint j_button, jint action);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadMoveEvent(
+    JNIEnv* env, jclass clazz, jstring j_device, jint axis, jfloat x, jfloat y);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onGamePadAxisEvent(
+    JNIEnv* env, jclass clazz, jstring j_device, jint axis_id, jfloat axis_val);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onReadNfcTag(JNIEnv* env,
+                                                                              jclass clazz,
+                                                                              jbyteArray j_data);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onRemoveNfcTag(JNIEnv* env,
+                                                                                jclass clazz);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchEvent(JNIEnv* env,
+                                                                              jclass clazz,
+                                                                              jfloat x, jfloat y,
+                                                                              jboolean pressed);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchMoved(JNIEnv* env, jclass clazz,
+                                                                          jfloat x, jfloat y);
+
+JNIEXPORT jbyteArray JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetIcon(JNIEnv* env,
+                                                                           jclass clazz,
+                                                                           jstring j_file);
+
+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetTitle(JNIEnv* env, jclass clazz,
+                                                                         jstring j_filename);
+
+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetDescription(JNIEnv* env,
+                                                                               jclass clazz,
+                                                                               jstring j_filename);
+
+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetGameId(JNIEnv* env, jclass clazz,
+                                                                          jstring j_filename);
+
+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetRegions(JNIEnv* env,
+                                                                           jclass clazz,
+                                                                           jstring j_filename);
+
+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetCompany(JNIEnv* env,
+                                                                           jclass clazz,
+                                                                           jstring j_filename);
+
+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetGitRevision(JNIEnv* env,
+                                                                               jclass clazz);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SetAppDirectory(JNIEnv* env,
+                                                                             jclass clazz,
+                                                                             jstring j_directory);
+
+JNIEXPORT void JNICALL
+Java_org_yuzu_yuzu_1emu_NativeLibrary_Java_org_yuzu_yuzu_1emu_NativeLibrary_InitializeGpuDriver(
+    JNIEnv* env, jclass clazz, jstring hook_lib_dir, jstring custom_driver_dir,
+    jstring custom_driver_name, jstring file_redirect_dir);
+
+JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_ReloadKeys(JNIEnv* env,
+                                                                            jclass clazz);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_utils_DirectoryInitialization_SetSysDirectory(
+    JNIEnv* env, jclass clazz, jstring path_);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SetSysDirectory(JNIEnv* env,
+                                                                             jclass clazz,
+                                                                             jstring path);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_InitializeEmulation(JNIEnv* env,
+                                                                                 jclass clazz);
+
+JNIEXPORT jint JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_DefaultCPUCore(JNIEnv* env,
+                                                                            jclass clazz);
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SetProfiling(JNIEnv* env, jclass clazz,
+                                                                          jboolean enable);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_WriteProfileResults(JNIEnv* env,
+                                                                                 jclass clazz);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_NotifyOrientationChange(
+    JNIEnv* env, jclass clazz, jint layout_option, jint rotation);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_Run__Ljava_lang_String_2(
+    JNIEnv* env, jclass clazz, jstring j_path);
+
+JNIEXPORT void JNICALL
+Java_org_yuzu_yuzu_1emu_NativeLibrary_Run__Ljava_lang_String_2Ljava_lang_String_2Z(
+    JNIEnv* env, jclass clazz, jstring j_file, jstring j_savestate, jboolean j_delete_savestate);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SurfaceChanged(JNIEnv* env,
+                                                                            jclass clazz,
+                                                                            jobject surf);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SurfaceDestroyed(JNIEnv* env,
+                                                                              jclass clazz);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_InitGameIni(JNIEnv* env, jclass clazz,
+                                                                         jstring j_game_id);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_ReloadSettings(JNIEnv* env,
+                                                                            jclass clazz);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SetUserSetting(
+    JNIEnv* env, jclass clazz, jstring j_game_id, jstring j_section, jstring j_key,
+    jstring j_value);
+
+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetUserSetting(
+    JNIEnv* env, jclass clazz, jstring game_id, jstring section, jstring key);
+
+JNIEXPORT jdoubleArray JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_GetPerfStats(JNIEnv* env,
+                                                                                  jclass clazz);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_LogDeviceInfo(JNIEnv* env,
+                                                                           jclass clazz);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SubmitInlineKeyboardText(
+    JNIEnv* env, jclass clazz, jstring j_text);
+
+JNIEXPORT void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_SubmitInlineKeyboardInput(
+    JNIEnv* env, jclass clazz, jint j_key_code);
+
+#ifdef __cplusplus
+}
+#endif

src/android/app/src/main/res/drawable/ic_pip_mute.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M7,9v6h4l5,5V4l-5,5H7z" />
-</vector>

src/android/app/src/main/res/drawable/ic_pip_unmute.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z" />
-</vector>

src/android/app/src/main/res/drawable/ic_system_update_alt.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M140,800q-24,0 -42,-18t-18,-42v-520q0,-24 18,-42t42,-18h250v60L140,220v520h680v-520L570,220v-60h250q24,0 42,18t18,42v520q0,24 -18,42t-42,18L140,800ZM480,615L280,415l43,-43 127,127v-339h60v339l127,-127 43,43 -200,200Z"/>
-</vector>

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

@@ -1,9 +1,13 @@
-<androidx.fragment.app.FragmentContainerView
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/fragment_container"
-    android:name="androidx.navigation.fragment.NavHostFragment"
+    android:id="@+id/frame_content"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:keepScreenOn="true"
-    app:defaultNavHost="true" />
+    android:keepScreenOn="true">
+
+    <FrameLayout
+        android:id="@+id/frame_emulation_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</FrameLayout>

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

@@ -12,24 +12,17 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <FrameLayout
-            android:id="@+id/emulation_container"
+        <!-- This is what everything is rendered to during emulation -->
+        <SurfaceView
+            android:id="@+id/surface_emulation"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <!-- This is what everything is rendered to during emulation -->
-            <org.yuzu.yuzu_emu.views.FixedRatioSurfaceView
-                android:id="@+id/surface_emulation"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:focusable="false"
-                android:focusableInTouchMode="false" />
-
-        </FrameLayout>
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:focusable="false"
+            android:focusableInTouchMode="false" />
 
         <FrameLayout
-            android:id="@+id/input_container"
+            android:id="@+id/overlay_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="bottom">
@@ -39,26 +32,10 @@
                 android:id="@+id/surface_input_overlay"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_gravity="center"
+                android:layout_gravity="bottom"
                 android:focusable="true"
                 android:focusableInTouchMode="true" />
 
-            <Button
-                style="@style/Widget.Material3.Button.ElevatedButton"
-                android:id="@+id/done_control_config"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/emulation_done"
-                android:visibility="gone" />
-
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/overlay_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
             <TextView
                 android:id="@+id/show_fps_text"
                 android:layout_width="wrap_content"
@@ -71,6 +48,14 @@
                 android:textSize="12sp"
                 tools:ignore="RtlHardcoded" />
 
+            <Button
+                style="@style/Widget.Material3.Button.ElevatedButton"
+                android:id="@+id/done_control_config"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/emulation_done"
+                android:visibility="gone" />
         </FrameLayout>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout 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="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?android:attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
     android:minHeight="72dp"
-    android:paddingVertical="@dimen/spacing_large"
     android:paddingStart="@dimen/spacing_large"
-    android:paddingEnd="24dp">
+    android:paddingEnd="24dp"
+    android:paddingVertical="@dimen/spacing_large">
 
     <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/switch_widget"
@@ -19,35 +19,32 @@
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
+    <com.google.android.material.textview.MaterialTextView
+        style="@style/TextAppearance.Material3.BodySmall"
+        android:id="@+id/text_setting_description"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignStart="@+id/text_setting_name"
+        android:layout_below="@+id/text_setting_name"
+        android:layout_marginEnd="@dimen/spacing_large"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:layout_toStartOf="@+id/switch_widget"
+        android:textAlignment="viewStart"
+        tools:text="@string/frame_limit_enable_description" />
+
+    <com.google.android.material.textview.MaterialTextView
+        style="@style/TextAppearance.Material3.HeadlineMedium"
+        android:id="@+id/text_setting_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:layout_centerVertical="true"
         android:layout_marginEnd="@dimen/spacing_large"
         android:layout_toStartOf="@+id/switch_widget"
-        android:gravity="center_vertical"
-        android:orientation="vertical">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text_setting_name"
-            style="@style/TextAppearance.Material3.HeadlineMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="viewStart"
-            android:textSize="16sp"
-            app:lineHeight="28dp"
-            tools:text="@string/frame_limit_enable" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text_setting_description"
-            style="@style/TextAppearance.Material3.BodySmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_small"
-            android:textAlignment="viewStart"
-            tools:text="@string/frame_limit_enable_description" />
-
-    </LinearLayout>
+        android:textSize="16sp"
+        android:textAlignment="viewStart"
+        app:lineHeight="28dp"
+        tools:text="@string/frame_limit_enable" />
 
 </RelativeLayout>

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

@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/text_header_name"
-    style="@style/TextAppearance.Material3.TitleSmall"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="start|center_vertical"
-    android:paddingHorizontal="@dimen/spacing_large"
-    android:paddingVertical="16dp"
-    android:textAlignment="viewStart"
-    android:textColor="?attr/colorPrimary"
-    android:textStyle="bold"
-    tools:text="CPU Settings" />
+    android:layout_height="48dp"
+    android:paddingVertical="4dp"
+    android:paddingHorizontal="@dimen/spacing_large">
+
+    <com.google.android.material.textview.MaterialTextView
+        style="@style/TextAppearance.Material3.TitleSmall"
+        android:id="@+id/text_header_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:textColor="?attr/colorPrimary"
+        android:textAlignment="viewStart"
+        android:textStyle="bold"
+        tools:text="CPU Settings" />
+
+</FrameLayout>

src/android/app/src/main/res/navigation/emulation_navigation.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation 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:id="@+id/emulation_navigation"
-    app:startDestination="@id/emulationFragment">
-
-    <fragment
-        android:id="@+id/emulationFragment"
-        android:name="org.yuzu.yuzu_emu.fragments.EmulationFragment"
-        android:label="fragment_emulation"
-        tools:layout="@layout/fragment_emulation" >
-        <argument
-            android:name="game"
-            app:argType="org.yuzu.yuzu_emu.model.Game" />
-    </fragment>
-
-</navigation>

src/android/app/src/main/res/navigation/home_navigation.xml

@@ -56,18 +56,4 @@
         android:name="org.yuzu.yuzu_emu.fragments.LicensesFragment"
         android:label="LicensesFragment" />
 
-    <activity
-        android:id="@+id/emulationActivity"
-        android:name="org.yuzu.yuzu_emu.activities.EmulationActivity"
-        android:label="EmulationActivity">
-        <argument
-            android:name="game"
-            app:argType="org.yuzu.yuzu_emu.model.Game" />
-    </activity>
-
-    <action
-        android:id="@+id/action_global_emulationActivity"
-        app:destination="@id/emulationActivity"
-        app:launchSingleTop="true" />
-
 </navigation>

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

@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_disclaimer">Diese Software kann Spiele für die Nintendo Switch abspielen. Keine Spiele oder Spielekeys sind enthalten.&lt;br /&gt;&lt;br /&gt;Bevor du beginnst, bitte halte deine <![CDATA[<b> prod.keys </b>]]> auf deinem Gerät bereit. .&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Mehr Infos</a>]]></string>
-    <string name="emulation_notification_channel_name">Emulation ist aktiv</string>
-    <string name="emulation_notification_channel_description">Zeigt eine dauerhafte Benachrichtigung an, wenn die Emulation läuft.</string>
-    <string name="emulation_notification_running">yuzu läuft</string>
-    <string name="notice_notification_channel_name">Hinweise und Fehler</string>
-    <string name="notice_notification_channel_description">Zeigt Benachrichtigungen an, wenn etwas schief läuft.</string>
-    <string name="notification_permission_not_granted">Berechtigung für Benachrichtigungen nicht erlaubt!</string>
-
-    <!-- Setup strings -->
-    <string name="welcome">Willkommen!</string>
-    <string name="welcome_description">Erfahre wie man &lt;b>yuzu&lt;/b> einrichtet und beginne mit der Emulation.</string>
-    <string name="get_started">Erste Schritte</string>
-    <string name="keys">Schlüssel</string>
-    <string name="keys_description">Wähle deine &lt;b>prod.keys&lt;/b> Datei mit dem Button unten aus.</string>
-    <string name="select_keys">Schlüssel auswählen</string>
-    <string name="games">Spiele</string>
-    <string name="games_description">Wähle mit dem Knopf unten den &lt;b>Spiele&lt;/b>-Ordner aus.</string>
-    <string name="done">Fertig</string>
-    <string name="done_description">Wir können loslegen.\nViel Spaß!</string>
-    <string name="text_continue">Fortsetzen</string>
-    <string name="next">Weiter</string>
-    <string name="back">Zurück</string>
-    <string name="add_games">Spiele hinzufügen</string>
-    <string name="add_games_description">Spieleverzeichnis auswählen</string>
-
-    <!-- Home strings -->
-    <string name="home_games">Spiele</string>
-    <string name="home_search">Suche</string>
-    <string name="home_settings">Einstellungen</string>
-    <string name="empty_gamelist">Es wurden keine Dateien gefunden oder es wurde noch kein Spielverzeichnis ausgewählt.</string>
-    <string name="search_and_filter_games">Spiele suchen und filtern</string>
-    <string name="select_games_folder">Spieleverzeichnis auswählen</string>
-    <string name="select_games_folder_description">Erlaubt yuzu die Spieleliste zu füllen</string>
-    <string name="add_games_warning">Auswahl des Spieleverzeichnisses überspringen?</string>
-    <string name="add_games_warning_description">Spiele werden in der Spieleliste nicht angezeigt, wenn kein Ordner ausgewählt ist.</string>
-    <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string>
-    <string name="home_search_games">Spiele suchen</string>
-    <string name="games_dir_selected">Spieleverzeichnis ausgewählt</string>
-    <string name="install_prod_keys">prod.keys installieren</string>
-    <string name="install_prod_keys_description">Zum Entschlüsseln von Spielen benötigt</string>
-    <string name="install_prod_keys_warning">Hinzufügen der Schlüssel überspringen?</string>
-    <string name="install_prod_keys_warning_description">Für die Emulation von Spielen sind gültige Schlüssel erforderlich. Wenn du fortfährst, funktionieren nur Homebrew-Anwendungen.</string>
-    <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string>
-    <string name="notifications">Benachrichtigungen</string>
-    <string name="notifications_description">Erteile mit dem Knopf unten die Berechtigung, Benachrichtigungen zu senden.</string>
-    <string name="give_permission">Berechtigung erteilen</string>
-    <string name="notification_warning_description">yuzu wird dich nicht über wichtige Informationen benachrichtigen können.</string>
-    <string name="permission_denied">Zugriff verweigert</string>
-    <string name="permission_denied_description">Du hast diese Berechtigung zu oft verweigert und musst sie nun manuell in den Systemeinstellungen erteilen.</string>
-    <string name="about">Über</string>
-    <string name="about_description">Build-Version, Credits und mehr</string>
-    <string name="warning_help">Hilfe</string>
-    <string name="warning_skip">Überspringen</string>
-    <string name="warning_cancel">Abbrechen</string>
-    <string name="install_amiibo_keys">Amiibo-Schlüssel installieren</string>
-    <string name="install_amiibo_keys_description">Benötigt um Amiibos im Spiel zu verwenden</string>
-    <string name="invalid_keys_file">Ungültige Schlüsseldatei ausgewählt</string>
-    <string name="install_keys_success">Schlüssel erfolgreich installiert</string>
-    <string name="reading_keys_failure">Fehler beim Lesen der Schlüssel</string>
-    <string name="invalid_keys_error">Ungültige Schlüssel</string>
-    <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>
-    <string name="install_gpu_driver">GPU-Treiber installieren</string>
-    <string name="install_gpu_driver_description">Alternative Treiber für eventuell bessere Leistung oder Genauigkeit installieren</string>
-    <string name="advanced_settings">Erweiterte Einstellungen</string>
-    <string name="settings_description">Emulatoreinstellungen konfigurieren</string>
-    <string name="search_recently_played">Kürzlich gespielt</string>
-    <string name="search_recently_added">Kürzlich hinzugefügt</string>
-    <string name="search_retail">Spiele</string>
-    <string name="search_homebrew">Homebrew</string>
-    <string name="open_user_folder">yuzu-Ordner öffnen</string>
-    <string name="open_user_folder_description">yuzu\'s interne Dateien verwalten</string>
-    <string name="theme_and_color_description">Das Aussehen der App ändern</string>
-    <string name="no_file_manager">Kein Dateimanager gefunden</string>
-    <string name="notification_no_directory_link">yuzu-Verzeichnis konnte nicht geöffnet werden</string>
-    <string name="notification_no_directory_link_description">Bitte suche den Benutzerordner manuell über die Seitenleiste des Dateimanagers.</string>
-    <string name="manage_save_data">Speicherdaten verwalten</string>
-    <string name="manage_save_data_description">Speicherdaten gefunden. Bitte wähle unten eine Option aus.</string>
-    <string name="import_export_saves_description">Speicherdaten importieren oder exportieren</string>
-    <string name="import_export_saves_no_profile">Keine Speicherdaten gefunden. Bitte starte ein Spiel und versuche es erneut.</string>
-    <string name="save_file_imported_success">Erfolgreich importiert</string>
-    <string name="save_file_invalid_zip_structure">Ungültige Speicherverzeichnisstruktur</string>
-    <string name="save_file_invalid_zip_structure_description">Der erste Unterordnername muss die Titel-ID des Spiels sein.</string>
-    <string name="import_saves">Importieren</string>
-    <string name="export_saves">Exportieren</string>
-
-    <!-- About screen strings -->
-    <string name="gaia_is_not_real">Gaia ist nicht real</string>
-    <string name="copied_to_clipboard">In die Zwischenablage kopiert</string>
-    <string name="about_app_description">Ein quelloffener Switch-Emulator</string>
-    <string name="contributors">Beitragende</string>
-    <string name="contributors_description">Gemacht mit \u2764 vom yuzu Team</string>
-    <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string>
-    <string name="build">Build</string>
-    <string name="support_link">https://discord.gg/u77vRWY</string>
-    <string name="website_link">https://yuzu-emu.org/</string>
-    <string name="github_link">https://github.com/yuzu-emu</string>
-
-    <!-- Early access upgrade strings -->
-    <string name="early_access">Early Access</string>
-    <string name="get_early_access">Early Access bekommen</string>
-    <string name="play_store_link">https://play.google.com/store/apps/details?id=org.yuzu.yuzu_emu.ea</string>
-    <string name="get_early_access_description">Neueste Features, frühzeitiger Zugriff auf Updates und mehr</string>
-    <string name="early_access_benefits">Early Access Vorteile</string>
-    <string name="cutting_edge_features">Neueste Features</string>
-    <string name="early_access_updates">Früherer Zugriff auf Updates</string>
-    <string name="no_manual_installation">Keine manuelle Installation</string>
-    <string name="prioritized_support">Priorisierte Unterstützung</string>
-    <string name="our_eternal_gratitude">Unsere ewige Dankbarkeit</string>
-    <string name="are_you_interested">Bist du interessiert?</string>
-
-    <!-- General settings strings -->
-    <string name="frame_limit_enable">Geschwindigkeitsbegrenzung aktivieren</string>
-    <string name="frame_limit_enable_description">Wenn aktiviert, wird die Emulationsgeschwindigkeit auf einen Prozentsatz der normalen Geschwindigkeit begrenzt.</string>
-    <string name="frame_limit_slider">Geschwindkeitsbegrenzung in Prozent</string>
-    <string name="frame_limit_slider_description">Legt den Prozentsatz der Bergrenzung der Emulationsgeschwindigkeit fest. Mit dem Standardwert von 100% wird die Emulation auf die normale Geschwindigkeit begrenzt. Höhere oder niedrigere Werte erhöhen oder verringern die Geschwindigkeitsbegrenzung.</string>
-    <string name="cpu_accuracy">CPU-Genauigkeit</string>
-
-    <!-- System settings strings -->
-    <string name="use_docked_mode">Dock-Modus</string>
-    <string name="use_docked_mode_description">Emuliert im Dock-Modus, was die Auflösung verbessert, aber die Leistung senkt.</string>
-    <string name="emulated_region">Emulierte Region</string>
-    <string name="emulated_language">Emulierte Sprache</string>
-    <string name="select_rtc_date">RTC-Datum auswählen</string>
-    <string name="select_rtc_time">RTC-Zeit auswählen</string>
-    <string name="use_custom_rtc">Benutzerdefinierte RTC aktivieren</string>
-    <string name="use_custom_rtc_description">Mit dieser Einstellung kann eine benutzerdefinierte Echtzeituhr unabhängig von der aktuellen Systemzeit verwendet werden.</string>
-    <string name="set_custom_rtc">Benutzerdefinierte RTC einstellen</string>
-
-    <!-- Graphics settings strings -->
-    <string name="renderer_api">API</string>
-    <string name="renderer_accuracy">Genauigkeitsstufe</string>
-    <string name="renderer_resolution">Auflösung</string>
-    <string name="renderer_vsync">VSync-Modus</string>
-    <string name="renderer_aspect_ratio">Seitenverhältnis</string>
-    <string name="renderer_scaling_filter">Fensteranpassungsfilter</string>
-    <string name="renderer_anti_aliasing">Kantenglättungs-Methode</string>
-    <string name="renderer_force_max_clock">Maximale Taktfrequenz erzwingen (nur Adreno)</string>
-    <string name="renderer_force_max_clock_description">Erzwingt den Betrieb der GPU mit der maximal möglichen Taktfrequenz (Temperaturbeschränkungen werden weiterhin angewendet).</string>
-    <string name="renderer_asynchronous_shaders">Asynchrone Shader nutzen</string>
-    <string name="renderer_asynchronous_shaders_description">Kompiliert Shader asynchron, was Ruckler reduziert, aber zu Glitches führen kann.</string>
-    <string name="renderer_debug">Grafik-Debugging aktivieren</string>
-    <string name="renderer_debug_description">Wenn aktiviert, schaltet die Grafik-API in einen langsameren Debugging-Modus.</string>
-    <string name="use_disk_shader_cache">Nutze Festplatten-Shader-Cache</string>
-    <string name="use_disk_shader_cache_description">Ruckeln wird durch das Speichern und Laden von generierten Shadern auf der Festplatte reduziert.</string>
-
-    <!-- Audio settings strings -->
-    <string name="audio_volume">Lautstärke</string>
-    <string name="audio_volume_description">Legt die Lautstärke der Audioausgabe fest.</string>
-
-    <!-- Miscellaneous -->
-    <string name="slider_default">Standard</string>
-    <string name="ini_saved">Einstellungen gespeichert</string>
-    <string name="gameid_saved">Einstellungen für %1$s gespeichert</string>
-    <string name="error_saving">Fehler beim Speichern von %1$s.ini: %2$s</string>
-    <string name="loading">Lädt...</string>
-    <string name="reset_setting_confirmation">Möchtest du diese Einstellung auf den Standardwert zurücksetzen?</string>
-    <string name="reset_to_default">Auf Standard zurücksetzen</string>
-    <string name="reset_all_settings">Alle Einstellungen zurücksetzen?</string>
-    <string name="reset_all_settings_description">Alle erweiterten Einstellungen werden auf ihren Standardwert zurückgesetzt. Dies kann nicht rückgängig gemacht werden.</string>
-    <string name="settings_reset">Einstellungen zurückgesetzt</string>
-    <string name="close">Schließen</string>
-    <string name="learn_more">Mehr erfahren</string>
-
-    <!-- GPU driver installation -->
-    <string name="select_gpu_driver">GPU-Treiber auswählen</string>
-    <string name="select_gpu_driver_title">Möchtest du deinen aktuellen GPU-Treiber ersetzen?</string>
-    <string name="select_gpu_driver_install">Installieren</string>
-    <string name="select_gpu_driver_default">Standard</string>
-    <string name="select_gpu_driver_install_success">%s wurde installiert</string>
-    <string name="select_gpu_driver_use_default">Standard GPU-Treiber wird verwendet</string>
-    <string name="select_gpu_driver_error">Ungültiger Treiber ausgewählt, Standard-Treiber wird verwendet!</string>
-    <string name="system_gpu_driver">System GPU-Treiber</string>
-    <string name="installing_driver">Treiber wird installiert...</string>
-
-    <!-- Preferences Screen -->
-    <string name="preferences_settings">Einstellungen</string>
-    <string name="preferences_general">Allgemein</string>
-    <string name="preferences_system">System</string>
-    <string name="preferences_graphics">Grafik</string>
-    <string name="preferences_audio">Audio</string>
-    <string name="preferences_theme">Theme und Farbe</string>
-
-    <!-- ROM loading errors -->
-    <string name="loader_error_encrypted">Das ROM ist verschlüsselt</string>
-    <string name="loader_error_encrypted_keys_description"><![CDATA[Bitte stelle sicher dass die <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> Datei installiert ist, damit Spiele entschlüsselt werden können.]]></string>
-    <string name="loader_error_video_core">Bei der Initialisierung des Videokerns ist ein Fehler aufgetreten</string>
-    <string name="loader_error_video_core_description">Dies wird normalerweise durch einen inkompatiblen GPU-Treiber verursacht. Die Installation eines passenden GPU-Treibers kann dieses Problem beheben.</string>
-    <string name="loader_error_invalid_format">ROM konnte nicht geladen werden</string>
-    <string name="loader_error_file_not_found">ROM-Datei existiert nicht</string>
-
-    <!-- Emulation Menu -->
-    <string name="emulation_exit">Emulation beenden</string>
-    <string name="emulation_done">Fertig</string>
-    <string name="emulation_fps_counter">FPS Zähler</string>
-    <string name="emulation_toggle_controls">Steuerung umschalten</string>
-    <string name="emulation_rel_stick_center">Relative Stick-Mitte</string>
-    <string name="emulation_dpad_slide">DPad Slide</string>
-    <string name="emulation_haptics">Haptik</string>
-    <string name="emulation_show_overlay">Overlay anzeigen</string>
-    <string name="emulation_toggle_all">Alle umschalten</string>
-    <string name="emulation_control_adjust">Overlay anpassen</string>
-    <string name="emulation_control_scale">Größe</string>
-    <string name="emulation_control_opacity">Transparenz</string>
-    <string name="emulation_touch_overlay_reset">Overlay zurücksetzen</string>
-    <string name="emulation_touch_overlay_edit">Overlay bearbeiten</string>
-    <string name="emulation_pause">Emulation pausieren</string>
-    <string name="emulation_unpause">Emulation fortsetzen</string>
-    <string name="emulation_input_overlay">Overlay-Optionen</string>
-    <string name="emulation_game_loading">Spiel lädt…</string>
-
-    <string name="load_settings">Lädt Einstellungen...</string>
-
-    <!-- Software keyboard -->
-    <string name="software_keyboard">Software-Tastatur</string>
-
-    <!-- Errors and warnings -->
-    <string name="abort_button">Abbrechen</string>
-    <string name="continue_button">Fortsetzen</string>
-    <string name="system_archive_not_found">Systemarchiv nicht gefunden</string>
-    <string name="system_archive_general">Ein System-Archiv</string>
-    <string name="save_load_error">Speicher-/Ladefehler</string>
-    <string name="fatal_error">Schwerwiegender Fehler</string>
-    <string name="fatal_error_message">Ein schwerwiegender Fehler ist aufgetreten. Einzelheiten wurden im Log protokolliert.\nDas Fortsetzen der Emulation kann zu Abstürzen und Bugs führen.</string>
-    <string name="performance_warning">Das Deaktivieren dieser Einstellung führt zu erheblichen Leistungsverlusten! Für ein optimales Erlebnis wird empfohlen, sie aktiviert zu lassen.</string>
-
-    <!-- Region Names -->
-    <string name="region_japan">Japan</string>
-    <string name="region_usa">USA</string>
-    <string name="region_europe">Europa</string>
-    <string name="region_australia">Australien</string>
-    <string name="region_china">China</string>
-    <string name="region_korea">Korea</string>
-    <string name="region_taiwan">Taiwan</string>
-
-    <!-- Language Names -->
-    <string name="language_japanese">Japanisch (日本語)</string>
-    <string name="language_english">Englisch</string>
-    <string name="language_french">Französisch (Français)</string>
-    <string name="langauge_german">Deutsch (German)</string>
-    <string name="language_italian">Italienisch (Italiano)</string>
-    <string name="language_spanish">Spanisch (Español)</string>
-    <string name="language_chinese">Chinesisch (简体中文)</string>
-    <string name="language_korean">Koreanisch (한국어)</string>
-    <string name="language_dutch">Niederländisch (Nederlands)</string>
-    <string name="language_portuguese">Portugiesisch (Português)</string>
-    <string name="language_russian">Russisch (Русский)</string>
-    <string name="language_taiwanese">Taiwanesisch (台湾)</string>
-    <string name="language_british_english">Britisches Englisch</string>
-    <string name="language_canadian_french">Kanadisches Französisch (Français canadien)</string>
-    <string name="language_latin_american_spanish">Lateinamerikanisches Spanisch (Español latinoamericano)</string>
-    <string name="language_simplified_chinese">Vereinfachtes Chinesisch (简体中文)</string>
-    <string name="language_traditional_chinese">Traditionelles Chinesisch (正體中文)</string>
-    <string name="language_brazilian_portuguese">Brasilianisches Portugiesisch (Português do Brasil)</string>
-
-    <!-- Renderer APIs -->
-    <string name="renderer_vulkan">Vulkan</string>
-    <string name="renderer_none">Keiner</string>
-
-    <!-- Renderer Accuracy -->
-    <string name="renderer_accuracy_normal">Normal</string>
-    <string name="renderer_accuracy_high">Hoch</string>
-    <string name="renderer_accuracy_extreme">Extrem (Langsam)</string>
-
-    <!-- Resolutions -->
-    <string name="resolution_half">0.5X (360p/540p)</string>
-    <string name="resolution_three_quarter">0.75X (540p/810p)</string>
-    <string name="resolution_one">1X (720p/1080p)</string>
-    <string name="resolution_two">2X (1440p/2160p) (Langsam)</string>
-    <string name="resolution_three">3X (2160p/3240p) (Langsam)</string>
-    <string name="resolution_four">4X (2880p/4320p) (Langsam)</string>
-
-    <!-- Renderer VSync -->
-    <string name="renderer_vsync_immediate">Direkt (Aus)</string>
-    <string name="renderer_vsync_mailbox">Mailbox</string>
-    <string name="renderer_vsync_fifo">FIFO (An)</string>
-    <string name="renderer_vsync_fifo_relaxed">FIFO Relaxed</string>
-
-    <!-- Scaling Filters -->
-    <string name="scaling_filter_nearest_neighbor">Nächste-Nachbarn</string>
-    <string name="scaling_filter_bilinear">Bilinear</string>
-    <string name="scaling_filter_bicubic">Bikubisch</string>
-    <string name="scaling_filter_gaussian">Gaussian</string>
-    <string name="scaling_filter_scale_force">ScaleForce</string>
-    <string name="scaling_filter_fsr">AMD FidelityFX™ Super Resolution</string>
-
-    <!-- Anti-Aliasing -->
-    <string name="anti_aliasing_none">Keiner</string>
-    <string name="anti_aliasing_fxaa">FXAA</string>
-    <string name="anti_aliasing_smaa">SMAA</string>
-
-    <!-- Aspect Ratios -->
-    <string name="ratio_default">Standard (16:9)</string>
-    <string name="ratio_force_four_three">4:3 erzwingen</string>
-    <string name="ratio_force_twenty_one_nine">21:9 erzwingen</string>
-    <string name="ratio_force_sixteen_ten">Erzwinge 16:10</string>
-    <string name="ratio_stretch">Auf Fenster anpassen</string>
-
-    <!-- CPU Accuracy -->
-    <string name="cpu_accuracy_accurate">Akkurat</string>
-    <string name="cpu_accuracy_unsafe">Unsicher</string>
-    <string name="cpu_accuracy_paranoid">Paranoid (Langsam)</string>
-
-    <!-- Gamepad Buttons -->
-    <string name="gamepad_d_pad">Steuerkreuz</string>
-    <string name="gamepad_left_stick">Linker Analogstick</string>
-    <string name="gamepad_right_stick">Rechter Analogstick</string>
-    <string name="gamepad_home">Home</string>
-    <string name="gamepad_screenshot">Screenshot</string>
-
-    <!-- Disk shader cache -->
-    <string name="preparing_shaders">Shader werden vorbereitet</string>
-    <string name="building_shaders">Shader werden erstellt</string>
-
-    <!-- Theme options -->
-    <string name="change_app_theme">App-Theme ändern</string>
-    <string name="theme_default">Standard</string>
-    <string name="theme_material_you">Material You</string>
-
-    <!-- Theme Modes -->
-    <string name="change_theme_mode">Theme-Modus ändern</string>
-    <string name="theme_mode_follow_system">System folgen</string>
-    <string name="theme_mode_light">Hell</string>
-    <string name="theme_mode_dark">Dunkel</string>
-
-    <!-- Black backgrounds theme -->
-    <string name="use_black_backgrounds">Schwarze Hintergünde verwenden</string>
-    <string name="use_black_backgrounds_description">Bei Verwendung des dunklen Themes, schwarze Hintergründe verwenden.</string>
-
-</resources>

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

@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_disclaimer">Este software ejecuta juegos para la videoconsola Nintendo Switch. Los videojuegos o keys no vienen incluidos.&lt;br /&gt;&lt;br /&gt;Antes de empezar, por favor, localice el archivo <![CDATA[<b> prod.keys </b>]]>en el almacenamiento de su dispositivo..&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">Saber más</a>]]></string>
-    <string name="emulation_notification_channel_name">Emulación activa</string>
-    <string name="emulation_notification_channel_description">Muestra una notificación persistente cuando la emulación está activa.</string>
-    <string name="emulation_notification_running">yuzu esta ejecutándose</string>
-    <string name="notice_notification_channel_name">Avisos y errores</string>
-    <string name="notice_notification_channel_description">Mostrar notificaciones cuándo algo vaya mal.</string>
-    <string name="notification_permission_not_granted">¡Permisos de notificación no concedidos!</string>
-
-    <!-- Setup strings -->
-    <string name="welcome">¡Bienvenido!</string>
-    <string name="welcome_description">Aprende cómo configurar &lt;b>yuzu&lt;/b> y avanza a la emulación.</string>
-    <string name="get_started">Empezar</string>
-    <string name="keys">Claves</string>
-    <string name="keys_description">Selecciona el archivo &lt;b>prod.keys&lt;/b> utilizando el botón de abajo.</string>
-    <string name="select_keys">Seleccionar las claves</string>
-    <string name="games">Juegos</string>
-    <string name="games_description">Selecciona la carpeta &lt;b>Games&lt;/b> utilizando el botón de abajo</string>
-    <string name="done">Hecho</string>
-    <string name="done_description">Todo listo.\n¡Disfrute de sus juegos!</string>
-    <string name="text_continue">Continuar</string>
-    <string name="next">Siguiente</string>
-    <string name="back">Atrás</string>
-    <string name="add_games">Añadir Juegos</string>
-    <string name="add_games_description">Selecciona la carpeta de juegos</string>
-
-    <!-- Home strings -->
-    <string name="home_games">Juegos</string>
-    <string name="home_search">Buscar</string>
-    <string name="home_settings">Ajustes</string>
-    <string name="empty_gamelist">No se ha encontrado ningún archivo o aún no se ha seleccionado ningún directorio de juegos.</string>
-    <string name="search_and_filter_games">Busca y filtra juegos</string>
-    <string name="select_games_folder">Seleccionar carpeta de juegos</string>
-    <string name="select_games_folder_description">Permite que yuzu llene la lista de juegos</string>
-    <string name="add_games_warning">¿Omitir la selección de la carpeta de juegos?</string>
-    <string name="add_games_warning_description">No se mostrará ningún juego si no se ha seleccionado una carpeta de juegos.</string>
-    <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string>
-    <string name="home_search_games">Buscar Juegos</string>
-    <string name="games_dir_selected">Directorio de juegos seleccionado</string>
-    <string name="install_prod_keys">Instalar prod.keys</string>
-    <string name="install_prod_keys_description">Requerido para descifrar juegos</string>
-    <string name="install_prod_keys_warning">¿Omitir agregar claves?</string>
-    <string name="install_prod_keys_warning_description">Se requieren claves válidas para emular juegos.  Solo las aplicaciones homebrew funcionarán si continúas.</string>
-    <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string>
-    <string name="notifications">Notificaciones</string>
-    <string name="notifications_description">Otorgue el permiso de notificación con el botón de abajo.</string>
-    <string name="give_permission">Conceder permiso</string>
-    <string name="notification_warning">¿Omitir conceder el permiso de notificación?</string>
-    <string name="notification_warning_description">yuzu no podrá notificarte información importante.</string>
-    <string name="permission_denied">Permiso denegado</string>
-    <string name="permission_denied_description">Negó este permiso demasiadas veces y ahora debe otorgarlo manualmente en la configuración del sistema.</string>
-    <string name="about">Acerca de</string>
-    <string name="about_description">Versión, créditos y más</string>
-    <string name="warning_help">Ayuda</string>
-    <string name="warning_skip">Siguiente</string>
-    <string name="warning_cancel">Cancelar</string>
-    <string name="install_amiibo_keys">Instalar clave de Amiiboo</string>
-    <string name="install_amiibo_keys_description">Necesario para usar Amiibo en el juego</string>
-    <string name="invalid_keys_file">Archivo de claves inválido seleccionado</string>
-    <string name="install_keys_success">Claves instaladas correctamente</string>
-    <string name="reading_keys_failure">Error al leer las claves de cifrado</string>
-    <string name="invalid_keys_error">Claves de cifrado no válidas</string>
-    <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>
-    <string name="install_keys_failure_description">El archivo seleccionado es incorrecto o está corrupto. Vuelva a redumpear sus claves.</string>
-    <string name="install_gpu_driver">Instalar driver de GPU</string>
-    <string name="install_gpu_driver_description">Instale drivers alternativos para obtener un rendimiento o una precisión potencialmente mejores</string>
-    <string name="advanced_settings">Opciones avanzadas</string>
-    <string name="settings_description">Configurar las opciones del emulador</string>
-    <string name="search_recently_played">Jugado recientemente</string>
-    <string name="search_recently_added">Añadido recientemente</string>
-    <string name="search_retail">Juegos</string>
-    <string name="search_homebrew">Homebrew</string>
-    <string name="open_user_folder">Abrir la carpeta de yuzu</string>
-    <string name="open_user_folder_description">Administrar los archivos internos de yuzu</string>
-    <string name="theme_and_color_description">Modificar la apariencia de la aplicación</string>
-    <string name="no_file_manager">Explorador de archivos no encontrado</string>
-    <string name="notification_no_directory_link">No se pudo abrir la carpeta yuzu</string>
-    <string name="notification_no_directory_link_description">Por favor, busque la carpeta user con el panel lateral del explorador de archivos de forma manual.</string>
-    <string name="manage_save_data">Administrar datos de guardado</string>
-    <string name="manage_save_data_description">Guardar los datos encontrados. Por favor, seleccione una opción de abajo.</string>
-    <string name="import_export_saves_description">Importar o exportar archivos de guardado</string>
-    <string name="import_export_saves_no_profile">No se han encontrado datos de guardado. Por favor, ejecute un juego y vuelva a intentarlo.</string>
-    <string name="save_file_imported_success">Importado correctamente</string>
-    <string name="save_file_invalid_zip_structure">Estructura del directorio de guardado no válido</string>
-    <string name="save_file_invalid_zip_structure_description">El nombre de la primera subcarpeta debe ser el Title ID del juego.</string>
-    <string name="import_saves">Importar</string>
-    <string name="export_saves">Exportar</string>
-
-    <!-- About screen strings -->
-    <string name="gaia_is_not_real">Gaia no es real</string>
-    <string name="copied_to_clipboard">Copiado al portapapeles</string>
-    <string name="about_app_description">Un emulador de Switch de código abierto</string>
-    <string name="contributors">Contribuidores</string>
-    <string name="contributors_description">Hecho con \u2764 del equipo yuzu</string>
-    <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string>
-    <string name="build">Versión</string>
-    <string name="support_link">https://discord.gg/u77vRWY</string>
-    <string name="website_link">https://yuzu-emu.org/</string>
-    <string name="github_link">https://github.com/yuzu-emu</string>
-
-    <!-- Early access upgrade strings -->
-    <string name="early_access">Early Access</string>
-    <string name="get_early_access">Conseguir Early Access</string>
-    <string name="play_store_link">https://play.google.com/store/apps/details?id=org.yuzu.yuzu_emu.ea</string>
-    <string name="get_early_access_description">Funciones de vanguardia, acceso anticipado a actualizaciones y más</string>
-    <string name="early_access_benefits">Beneficios Early Access</string>
-    <string name="cutting_edge_features">Características de vanguardia</string>
-    <string name="early_access_updates">Acceso anticipado a las actualizaciones</string>
-    <string name="no_manual_installation">Sin instalación manual</string>
-    <string name="prioritized_support">Soporte prioritario</string>
-    <string name="helping_game_preservation">Ayudarás a la preservación de juegos</string>
-    <string name="our_eternal_gratitude">Nuestra eterna gratitud</string>
-    <string name="are_you_interested">¿Estás interesado?</string>
-
-    <!-- General settings strings -->
-    <string name="frame_limit_enable">Activar limite de velocidad</string>
-    <string name="frame_limit_enable_description">Cuando está habilitado, la velocidad de emulación se limitará a un porcentaje específico de la velocidad normal.</string>
-    <string name="frame_limit_slider">Limitar porcentaje de velocidad</string>
-    <string name="frame_limit_slider_description">Especifica el porcentaje para limitar la velocidad de emulación.  Con el valor predeterminado del 100 %, la emulación se limitará a la velocidad normal.  Valores más altos o más bajos aumentarán o disminuirán el límite de velocidad.</string>
-    <string name="cpu_accuracy">Precisión de CPU</string>
-
-    <!-- System settings strings -->
-    <string name="use_docked_mode">Modo sobremesa</string>
-    <string name="use_docked_mode_description">Emula en modo sobremesa, lo que aumenta la resolución perjudicando el rendimiento.</string>
-    <string name="emulated_region">Región emulada</string>
-    <string name="emulated_language">Idioma emulado</string>
-    <string name="select_rtc_date">Seleccionar Fecha RTC</string>
-    <string name="select_rtc_time">Seleccionar Tiempo RTC</string>
-    <string name="use_custom_rtc">Habilitar RTC Personalizado</string>
-    <string name="use_custom_rtc_description">Esta configuración le permite configurar un reloj de tiempo real personalizado diferente a la hora actual de su sistema</string>
-    <string name="set_custom_rtc">Establecer RTC Personalizado</string>
-
-    <!-- Graphics settings strings -->
-    <string name="renderer_api">API</string>
-    <string name="renderer_accuracy">Nivel de precisión</string>
-    <string name="renderer_resolution">Resolución</string>
-    <string name="renderer_vsync">Modo VSync</string>
-    <string name="renderer_aspect_ratio">Relación de aspecto</string>
-    <string name="renderer_scaling_filter">Filtro de adaptación de ventana</string>
-    <string name="renderer_anti_aliasing">Metodo Anti Aliasing</string>
-    <string name="renderer_force_max_clock">Forzar velocidad al máximo (solo Adreno)</string>
-    <string name="renderer_force_max_clock_description">Fuerza a la GPU a ejecutarse a la velocidad máxima de reloj posible (se seguirán aplicando restricciones térmicas).</string>
-    <string name="renderer_asynchronous_shaders">Usar shaders asíncronos</string>
-    <string name="renderer_asynchronous_shaders_description">Compila shaders de forma asincrónica, lo que reducirá los parones pero puede introducir fallos.</string>
-    <string name="renderer_debug">Habilitar la depuración de gráficos</string>
-    <string name="renderer_debug_description">Cuando esté marcado, la API de gráficos entra en un modo de depuración más lento.</string>
-    <string name="use_disk_shader_cache">Usar caché de shaders en disco</string>
-    <string name="use_disk_shader_cache_description">Reduzca los parones almacenando y cargando shaders generados en el disco.</string>
-
-    <!-- Audio settings strings -->
-    <string name="audio_volume">Volumen</string>
-    <string name="audio_volume_description">Especifica el volumen de la salida de audio.</string>
-
-    <!-- Miscellaneous -->
-    <string name="slider_default">Predeterminado</string>
-    <string name="ini_saved">Configuración guardada</string>
-    <string name="gameid_saved">Configuración guardada para %1$s</string>
-    <string name="error_saving">Error guardando %1$s.ini: %2$s</string>
-    <string name="loading">Cargando...</string>
-    <string name="reset_setting_confirmation">¿Desea restablecer esta configuración a su valor predeterminado?</string>
-    <string name="reset_to_default">Restablecer a predeterminado</string>
-    <string name="reset_all_settings">¿Restablecer todas las configuraciones?</string>
-    <string name="reset_all_settings_description">Todas las configuraciones avanzadas se restablecerán a su configuración predeterminada. Esto no se puede deshacer.</string>
-    <string name="settings_reset">Reiniciar la configuracion</string>
-    <string name="close">Cerrar</string>
-    <string name="learn_more">Más información</string>
-
-    <!-- GPU driver installation -->
-    <string name="select_gpu_driver">Seleccionar driver GPU</string>
-    <string name="select_gpu_driver_title">¿Quiere reemplazar el driver de GPU actual?</string>
-    <string name="select_gpu_driver_install">Instalar</string>
-    <string name="select_gpu_driver_default">Predeterminado</string>
-    <string name="select_gpu_driver_install_success">Instalado %s</string>
-    <string name="select_gpu_driver_use_default">Usando el driver de GPU por defecto </string>
-    <string name="select_gpu_driver_error">¡Driver no válido, utilizando el predeterminado del sistema!</string>
-    <string name="system_gpu_driver">Driver GPU del sistema</string>
-    <string name="installing_driver">Instalando driver...</string>
-
-    <!-- Preferences Screen -->
-    <string name="preferences_settings">Ajustes</string>
-    <string name="preferences_general">General</string>
-    <string name="preferences_system">Sistema</string>
-    <string name="preferences_graphics">Gráficos</string>
-    <string name="preferences_audio">Audio</string>
-    <string name="preferences_theme">Tema y color</string>
-
-    <!-- ROM loading errors -->
-    <string name="loader_error_encrypted">Su ROM está encriptada</string>
-    <string name="loader_error_encrypted_roms_description"><![CDATA[Por favor, siga las guías para redumpear <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-cartridge-games\">cartuchos de juegos</a> o <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-installed-titles-eshop\">titulos instalados</a>.]]></string>
-    <string name="loader_error_encrypted_keys_description"><![CDATA[Por favor, compruebe que su archivo <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> está instalado, para que los juegos sean descifrados.]]></string>
-    <string name="loader_error_video_core">Ocurrió un error al inicializar el núcleo de video, posiblemente debido a una incompatibilidad con el driver seleccionado</string>
-    <string name="loader_error_video_core_description">Esto suele deberse a un driver de GPU incompatible. La instalación de un controlador de GPU personalizado puede resolver este problema.</string>
-    <string name="loader_error_invalid_format">No se pudo cargar la ROM</string>
-    <string name="loader_error_file_not_found">Archivo ROM no existe</string>
-
-    <!-- Emulation Menu -->
-    <string name="emulation_exit">Salir de la emulación</string>
-    <string name="emulation_done">Hecho</string>
-    <string name="emulation_fps_counter">Contador de FPS</string>
-    <string name="emulation_toggle_controls">Alternar Controles</string>
-    <string name="emulation_rel_stick_center">Centro Relativo del Stick</string>
-    <string name="emulation_dpad_slide">Deslizamiento de la Cruceta</string>
-    <string name="emulation_haptics">Hápticos</string>
-    <string name="emulation_show_overlay">Mostrar pantalla</string>
-    <string name="emulation_toggle_all">Alternar Todo</string>
-    <string name="emulation_control_adjust">Ajustar pantalla</string>
-    <string name="emulation_control_scale">Escala</string>
-    <string name="emulation_control_opacity">Opacidad</string>
-    <string name="emulation_touch_overlay_reset">Reiniciar pantalla</string>
-    <string name="emulation_touch_overlay_edit">Editar pantalla</string>
-    <string name="emulation_pause">Pausar Emulación</string>
-    <string name="emulation_unpause">Reanudar Emulación</string>
-    <string name="emulation_input_overlay">Opciones de pantalla </string>
-    <string name="emulation_game_loading">Cargando juego...</string>
-
-    <string name="load_settings">Cargando configuración...</string>
-
-    <!-- Software keyboard -->
-    <string name="software_keyboard">Software del teclado</string>
-
-    <!-- Errors and warnings -->
-    <string name="abort_button">Abortar</string>
-    <string name="continue_button">Continuar</string>
-    <string name="system_archive_not_found">Archivo del sistema no encontrado</string>
-    <string name="system_archive_not_found_message">%s no se ha encontrado. Vacíe los archivos de su sistema.\nContinuar con la emulación puede provocar bloqueos y errores.</string>
-    <string name="system_archive_general">Un archivo del sistema</string>
-    <string name="save_load_error">Error de Guardado/Carga</string>
-    <string name="fatal_error">Error fatal</string>
-    <string name="fatal_error_message">Ocurrió un error fatal. Consulte el registro para obtener más detalles.\nContinuar con la emulación puede provocar bloqueos y errores.</string>
-    <string name="performance_warning">¡Desactivar esta configuración reducirá significativamente el rendimiento de la emulación!  Para obtener la mejor experiencia, se recomienda dejar esta configuración habilitada.</string>
-
-    <!-- Region Names -->
-    <string name="region_japan">Japón</string>
-    <string name="region_usa">EEUU</string>
-    <string name="region_europe">Europa</string>
-    <string name="region_australia">Australia</string>
-    <string name="region_china">China</string>
-    <string name="region_korea">Corea</string>
-    <string name="region_taiwan">Taiwán</string>
-
-    <!-- Language Names -->
-    <string name="language_japanese">Japonés (日本語)</string>
-    <string name="language_english">Inglés (English)</string>
-    <string name="language_french">Francés (Français)</string>
-    <string name="langauge_german">Alemán (deutsch)</string>
-    <string name="language_italian">Italiano (Italiano)</string>
-    <string name="language_spanish">Español (Español)</string>
-    <string name="language_chinese">Chino (简体中文)</string>
-    <string name="language_korean">Coreano (한국어)</string>
-    <string name="language_dutch">Holandés (nederlands)</string>
-    <string name="language_portuguese">Portugués (Português)</string>
-    <string name="language_russian">Ruso (Русский)</string>
-    <string name="language_taiwanese">Taiwanés (台湾)</string>
-    <string name="language_british_english">Inglés británico</string>
-    <string name="language_canadian_french">Francés Canadiense (Français canadien)</string>
-    <string name="language_latin_american_spanish">Español Latinoamericano (Español latinoamericano)</string>
-    <string name="language_simplified_chinese">Chino Simplificado (简体中文)</string>
-    <string name="language_traditional_chinese">Chino tradicional (正體中文)</string>
-    <string name="language_brazilian_portuguese">Portugués Brasileño (Português do Brasil)</string>
-
-    <!-- Renderer APIs -->
-    <string name="renderer_vulkan">Vulkan</string>
-    <string name="renderer_none">Ninguno</string>
-
-    <!-- Renderer Accuracy -->
-    <string name="renderer_accuracy_normal">Normal</string>
-    <string name="renderer_accuracy_high">Alto</string>
-    <string name="renderer_accuracy_extreme">Extremo (Lento)</string>
-
-    <!-- Resolutions -->
-    <string name="resolution_half">0.5X (360p/540p)</string>
-    <string name="resolution_three_quarter">0.75X (540p/810p)</string>
-    <string name="resolution_one">x1 (720p/1080p)</string>
-    <string name="resolution_two">2X (1440p/2160p) (Lento)</string>
-    <string name="resolution_three">3X (2160p/3240p) (Lento)</string>
-    <string name="resolution_four">4X (2880p/4320p) (Lento)</string>
-
-    <!-- Renderer VSync -->
-    <string name="renderer_vsync_immediate">Inmediata (Desactivado)</string>
-    <string name="renderer_vsync_mailbox">Mailbox</string>
-    <string name="renderer_vsync_fifo">FIFO (Activado)</string>
-    <string name="renderer_vsync_fifo_relaxed">FIFO Relajado</string>
-
-    <!-- Scaling Filters -->
-    <string name="scaling_filter_nearest_neighbor">Vecino más próximo</string>
-    <string name="scaling_filter_bilinear">Bilineal</string>
-    <string name="scaling_filter_bicubic">Bicúbico</string>
-    <string name="scaling_filter_gaussian">Gaussiano</string>
-    <string name="scaling_filter_scale_force">ScaleForce</string>
-    <string name="scaling_filter_fsr">AMD FidelityFX™ Super Resolución</string>
-
-    <!-- Anti-Aliasing -->
-    <string name="anti_aliasing_none">Ninguno</string>
-    <string name="anti_aliasing_fxaa">FXAA</string>
-    <string name="anti_aliasing_smaa">SMAA</string>
-
-    <!-- Aspect Ratios -->
-    <string name="ratio_default">Predeterminado (16:9)</string>
-    <string name="ratio_force_four_three">Forzar 4:3</string>
-    <string name="ratio_force_twenty_one_nine">Forzar 21:9</string>
-    <string name="ratio_force_sixteen_ten">Forzar 16:10</string>
-    <string name="ratio_stretch">Ajustar a la ventana</string>
-
-    <!-- CPU Accuracy -->
-    <string name="cpu_accuracy_accurate">Preciso</string>
-    <string name="cpu_accuracy_unsafe">Impreciso</string>
-    <string name="cpu_accuracy_paranoid">Paranoico (Lento)</string>
-
-    <!-- Gamepad Buttons -->
-    <string name="gamepad_d_pad">Cruceta</string>
-    <string name="gamepad_left_stick">Palanca izquierda</string>
-    <string name="gamepad_right_stick">Palanca derecha</string>
-    <string name="gamepad_home">Home</string>
-    <string name="gamepad_screenshot">Captura de pantalla</string>
-
-    <!-- Disk shader cache -->
-    <string name="preparing_shaders">Preparando shaders</string>
-    <string name="building_shaders">Construyendo shaders</string>
-
-    <!-- Theme options -->
-    <string name="change_app_theme">Cambiar Tema</string>
-    <string name="theme_default">Predeterminado</string>
-    <string name="theme_material_you">Material You</string>
-
-    <!-- Theme Modes -->
-    <string name="change_theme_mode">Cambiar modo del tema</string>
-    <string name="theme_mode_follow_system">Igual al sistema</string>
-    <string name="theme_mode_light">Claro</string>
-    <string name="theme_mode_dark">Oscuro</string>
-
-    <!-- Black backgrounds theme -->
-    <string name="use_black_backgrounds">Usar Fondos Negros</string>
-    <string name="use_black_backgrounds_description">Cuando utilice el modo oscuro, aplique fondos negros.</string>
-
-</resources>

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

@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="app_disclaimer">Ce logiciel exécutera des jeux pour la console de jeu Nintendo Switch. Aucun jeux ou clés n\'est inclus.&lt;br /&gt;&lt;br /&gt;Avant de commencer, veuillez localiser votre fichier <![CDATA[<b> prod.keys </b>]]> sur le stockage de votre appareil.&lt;br /&gt;&lt;br /&gt;<![CDATA[<a href=\"https://yuzu-emu.org/help/quickstart\">En savoir plus</a>]]></string>
-    <string name="emulation_notification_channel_name">L\'émulation est active</string>
-    <string name="emulation_notification_channel_description">Affiche une notification persistante lorsque l\'émulation est en cours d\'exécution.</string>
-    <string name="emulation_notification_running">yuzu est en cours d\'exécution</string>
-    <string name="notice_notification_channel_name">Avis et erreurs</string>
-    <string name="notice_notification_channel_description">Affiche des notifications en cas de problème.</string>
-    <string name="notification_permission_not_granted">Permission de notification non accordée !</string>
-
-    <!-- Setup strings -->
-    <string name="welcome">Bienvenue !</string>
-    <string name="welcome_description">Apprenez à configurer &lt;b>yuzu&lt;/b> et passez à l\'émulation.</string>
-    <string name="get_started">Commencer</string>
-    <string name="keys">Clés</string>
-    <string name="keys_description">Sélectionnez votre fichier &lt;b>prod.keys&lt;/b> avec le bouton ci-dessous.</string>
-    <string name="select_keys">Sélectionner les clés</string>
-    <string name="games">Jeux</string>
-    <string name="games_description">Sélectionnez votre dossier &lt;b>de Jeux&lt;/b> avec le bouton ci-dessous.</string>
-    <string name="done">Terminé</string>
-    <string name="done_description">Vous êtes prêt.\nProfitez de vos jeux !</string>
-    <string name="text_continue">Continuer</string>
-    <string name="next">Suivant</string>
-    <string name="back">Retour</string>
-    <string name="add_games">Ajouter des jeux</string>
-    <string name="add_games_description">Sélectionner votre dossier de jeux</string>
-
-    <!-- Home strings -->
-    <string name="home_games">Jeux</string>
-    <string name="home_search">Rechercher</string>
-    <string name="home_settings">Paramètres</string>
-    <string name="empty_gamelist">Aucun fichier n\'a été trouvé ou aucun répertoire de jeu n\'a encore été sélectionné.</string>
-    <string name="search_and_filter_games">Rechercher et filtrer les jeux</string>
-    <string name="select_games_folder">Sélectionner le dossier de jeux</string>
-    <string name="select_games_folder_description">Permet à yuzu de remplir la liste des jeux</string>
-    <string name="add_games_warning">Ne pas sélectionner le dossier des jeux ?</string>
-    <string name="add_games_warning_description">Les jeux ne seront pas affichés dans la liste des jeux si aucun dossier n\'est sélectionné.</string>
-    <string name="add_games_warning_help">https://yuzu-emu.org/help/quickstart/#dumping-games</string>
-    <string name="home_search_games">Rechercher des jeux</string>
-    <string name="games_dir_selected">Répertoire de jeux sélectionné</string>
-    <string name="install_prod_keys">Installer prod.keys</string>
-    <string name="install_prod_keys_description">Nécessaire pour décrypter les jeux commerciaux.</string>
-    <string name="install_prod_keys_warning">Sauter l\'ajout des clés ?</string>
-    <string name="install_prod_keys_warning_description">Des clés valides sont nécessaires pour émuler des jeux commerciaux. Seules les applications homebrew fonctionneront si vous continuez.</string>
-    <string name="install_prod_keys_warning_help">https://yuzu-emu.org/help/quickstart/#guide-introduction</string>
-    <string name="notifications">Notifications</string>
-    <string name="notifications_description">Accordez l\'autorisation de notification avec le bouton ci-dessous.</string>
-    <string name="give_permission">Donner la permission</string>
-    <string name="notification_warning">Ne pas accorder la permission de notification ?</string>
-    <string name="notification_warning_description">yuzu ne pourra pas vous communiquer d\'informations importantes.</string>
-    <string name="permission_denied">Permission refusée</string>
-    <string name="permission_denied_description">Vous avez refusé cette permission trop de fois et vous devez maintenant l\'accorder manuellement dans les paramètres système.</string>
-    <string name="about">À propos</string>
-    <string name="about_description">Numéro de build, crédits et plus encore</string>
-    <string name="warning_help">Aide</string>
-    <string name="warning_skip">Sauter</string>
-    <string name="warning_cancel">Annuler</string>
-    <string name="install_amiibo_keys">Installer les clés Amiibo</string>
-    <string name="install_amiibo_keys_description">Nécessaire pour utiliser les Amiibo en jeu</string>
-    <string name="invalid_keys_file">Fichier de clés sélectionné invalide</string>
-    <string name="install_keys_success">Clés installées avec succès</string>
-    <string name="reading_keys_failure">Erreur lors de la lecture des clés de chiffrement</string>
-    <string name="invalid_keys_error">Clés de chiffrement invalides</string>
-    <string name="dumping_keys_quickstart_link">https://yuzu-emu.org/help/quickstart/#dumping-decryption-keys</string>
-    <string name="install_keys_failure_description">Le fichier sélectionné est incorrect ou corrompu. Veuillez dumper à nouveau vos clés.</string>
-    <string name="install_gpu_driver">Installer le pilote du GPU</string>
-    <string name="install_gpu_driver_description">Installez des pilotes alternatifs pour des performances ou une précision potentiellement meilleures</string>
-    <string name="advanced_settings">Paramètres avancés</string>
-    <string name="settings_description">Configurer les paramètres de l\'émulateur</string>
-    <string name="search_recently_played">Joué récemment</string>
-    <string name="search_recently_added">Ajouté récemment</string>
-    <string name="search_retail">Commercial</string>
-    <string name="search_homebrew">Homebrew</string>
-    <string name="open_user_folder">Ouvrir le dossier de yuzu</string>
-    <string name="open_user_folder_description">Gérer les fichiers internes de yuzu</string>
-    <string name="theme_and_color_description">Modifier l\'apparence de l\'application</string>
-    <string name="no_file_manager">Aucun gestionnaire de fichiers trouvé</string>
-    <string name="notification_no_directory_link">Impossible d\'ouvrir le répertoire de yuzu</string>
-    <string name="notification_no_directory_link_description">Veuillez localiser manuellement le dossier utilisateur avec le panneau latéral du gestionnaire de fichiers.</string>
-    <string name="manage_save_data">Gérer les données de sauvegarde</string>
-    <string name="manage_save_data_description">Données de sauvegarde trouvées. Veuillez sélectionner une option ci-dessous.</string>
-    <string name="import_export_saves_description">Importer ou exporter des fichiers de sauvegarde</string>
-    <string name="import_export_saves_no_profile">Aucune données de sauvegarde trouvées. Veuillez lancer un jeu et réessayer.</string>
-    <string name="save_file_imported_success">Importé avec succès</string>
-    <string name="save_file_invalid_zip_structure">Structure de répertoire de sauvegarde non valide</string>
-    <string name="save_file_invalid_zip_structure_description">Le nom du premier sous-dossier doit être l\'identifiant du titre du jeu.</string>
-    <string name="import_saves">Importer</string>
-    <string name="export_saves">Exporter</string>
-
-    <!-- About screen strings -->
-    <string name="gaia_is_not_real">Gaia n\'est pas réel</string>
-    <string name="copied_to_clipboard">Copié dans le presse-papier</string>
-    <string name="about_app_description">Un émulateur Switch open source</string>
-    <string name="contributors">Contributeurs</string>
-    <string name="contributors_description">Fait avec \u2764 de l\'équipe yuzu</string>
-    <string name="contributors_link">https://github.com/yuzu-emu/yuzu/graphs/contributors</string>
-    <string name="build">Build</string>
-    <string name="support_link">https://discord.gg/u77vRWY</string>
-    <string name="website_link">https://yuzu-emu.org/</string>
-    <string name="github_link">https://github.com/yuzu-emu</string>
-
-    <!-- Early access upgrade strings -->
-    <string name="early_access">Early Access</string>
-    <string name="get_early_access">Obtenir l\'Early Access</string>
-    <string name="play_store_link">https://play.google.com/store/apps/details?id=org.yuzu.yuzu_emu.ea</string>
-    <string name="get_early_access_description">Fonctionnalités de pointe, accès anticipé aux mises à jour, et plus encore</string>
-    <string name="early_access_benefits">Avantages de l\'Early Access</string>
-    <string name="cutting_edge_features">Fonctionnalités de pointe</string>
-    <string name="early_access_updates">Accès anticipé aux mises à jour</string>
-    <string name="no_manual_installation">Pas d\'installation manuelle</string>
-    <string name="prioritized_support">Assistance prioritaire</string>
-    <string name="helping_game_preservation">Contribuer à la préservation des jeux</string>
-    <string name="our_eternal_gratitude">Notre gratitude éternelle</string>
-    <string name="are_you_interested">Es tu intéressé ?</string>
-
-    <!-- General settings strings -->
-    <string name="frame_limit_enable">Activer la vitesse limite</string>
-    <string name="frame_limit_enable_description">Lorsqu\'elle est activée, la vitesse d\'émulation sera limitée à un pourcentage spécifié de la vitesse normale.</string>
-    <string name="frame_limit_slider">Limite en pourcentage de vitesse</string>
-    <string name="frame_limit_slider_description">Spécifie le pourcentage pour limiter la vitesse d\'émulation. Avec la valeur par défaut de 100%, l\'émulation sera limitée à la vitesse normale. Des valeurs supérieures ou inférieures augmenteront ou diminueront la limite de vitesse.</string>
-    <string name="cpu_accuracy">Précision du CPU</string>
-
-    <!-- System settings strings -->
-    <string name="use_docked_mode">Mode TV</string>
-    <string name="use_docked_mode_description">Émuler en mode TV augmente la résolution au détriment des performances.</string>
-    <string name="emulated_region">Région émulée</string>
-    <string name="emulated_language">Langue émulée</string>
-    <string name="select_rtc_date">Sélectionner la date RTC</string>
-    <string name="select_rtc_time">Sélectionner l\'heure RTC</string>
-    <string name="use_custom_rtc">Activer l\'horloge RTC personnalisée</string>
-    <string name="use_custom_rtc_description">Ce paramètre vous permet de définir une horloge en temps réel personnalisée distincte de l\'heure actuelle de votre système.</string>
-    <string name="set_custom_rtc">Définir l\'horloge RTC personnalisée</string>
-
-    <!-- Graphics settings strings -->
-    <string name="renderer_api">API</string>
-    <string name="renderer_accuracy">Niveau de précision</string>
-    <string name="renderer_resolution">Résolution</string>
-    <string name="renderer_vsync">Mode VSync</string>
-    <string name="renderer_aspect_ratio">Format</string>
-    <string name="renderer_scaling_filter">Filtre de fenêtre adaptatif</string>
-    <string name="renderer_anti_aliasing">Méthode d\'anticrénelage :</string>
-    <string name="renderer_force_max_clock">Forcer la fréquence d\'horloge maximale (Adreno uniquement)</string>
-    <string name="renderer_force_max_clock_description">Force le GPU à fonctionner au maximum d\'horloges possibles (les contraintes thermiques seront toujours appliquées).</string>
-    <string name="renderer_asynchronous_shaders">Utiliser les shaders asynchrones</string>
-    <string name="renderer_asynchronous_shaders_description">Compile les shaders de manière asynchrone, ce qui réduira les saccades mais peut entraîner des problèmes visuels.</string>
-    <string name="renderer_debug">Activer le débogage des graphismes</string>
-    <string name="renderer_debug_description">Lorsque cette case est cochée, l\'API graphique entre dans un mode de débogage plus lent.</string>
-    <string name="use_disk_shader_cache">Utiliser les shader cache de disque</string>
-    <string name="use_disk_shader_cache_description">Réduire les saccades en stockant et en chargeant les shaders générés sur le disque.</string>
-
-    <!-- Audio settings strings -->
-    <string name="audio_volume">Volume</string>
-    <string name="audio_volume_description">Spécifie le volume de la sortie audio.</string>
-
-    <!-- Miscellaneous -->
-    <string name="slider_default">Défaut</string>
-    <string name="ini_saved">Paramètres enregistrés</string>
-    <string name="gameid_saved">Paramètres enregistrés pour %1$s</string>
-    <string name="error_saving">Erreur lors de l\'enregistrement de %1$s.ini: %2$s</string>
-    <string name="loading">Chargement...</string>
-    <string name="reset_setting_confirmation">Voulez-vous réinitialiser ce paramètre à sa valeur par défaut ?</string>
-    <string name="reset_to_default">Réinitialiser par défaut</string>
-    <string name="reset_all_settings">Réinitialiser tous les réglages ?</string>
-    <string name="reset_all_settings_description">Tous les paramètres avancés seront réinitialisés à leur configuration par défaut. Ça ne peut pas être annulé.</string>
-    <string name="settings_reset">Paramètres réinitialisés</string>
-    <string name="close">Fermer</string>
-    <string name="learn_more">Plus d\'informations</string>
-
-    <!-- GPU driver installation -->
-    <string name="select_gpu_driver">Sélectionner le pilote du GPU</string>
-    <string name="select_gpu_driver_title">Souhaitez vous remplacer votre pilote actuel ?</string>
-    <string name="select_gpu_driver_install">Installer</string>
-    <string name="select_gpu_driver_default">Défaut</string>
-    <string name="select_gpu_driver_install_success">%s Installé</string>
-    <string name="select_gpu_driver_use_default">Utilisation du pilote de GPU par défaut</string>
-    <string name="select_gpu_driver_error">Pilote non valide sélectionné, utilisation du paramètre par défaut du système !</string>
-    <string name="system_gpu_driver">Pilote du GPU du système</string>
-    <string name="installing_driver">Installation du pilote...</string>
-
-    <!-- Preferences Screen -->
-    <string name="preferences_settings">Paramètres</string>
-    <string name="preferences_general">Général</string>
-    <string name="preferences_system">Système</string>
-    <string name="preferences_graphics">Vidéo</string>
-    <string name="preferences_audio">Audio</string>
-    <string name="preferences_theme">Thème et couleur</string>
-
-    <!-- ROM loading errors -->
-    <string name="loader_error_encrypted">Votre ROM est cryptée</string>
-    <string name="loader_error_encrypted_roms_description"><![CDATA[Veuillez suivre les guides pour redumper vos <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-cartridge-games\">cartouches de jeu</a> ou <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-installed-titles-eshop\">titres installés</a>.]]></string>
-    <string name="loader_error_encrypted_keys_description"><![CDATA[Veuillez vous assurer que votre fichier <a href=\"https://yuzu-emu.org/help/quickstart/#dumping-prodkeys-and-titlekeys\">prod.keys</a> est installé pour que les jeux puissent être déchiffrés.]]></string>
-    <string name="loader_error_video_core">Une erreur s\'est produite lors de l\'initialisation du noyau vidéo</string>
-    <string name="loader_error_video_core_description">Cela est généralement dû à un pilote du GPU incompatible. L\'installation d\'un pilote du GPU personnalisé peut résoudre ce problème.</string>
-    <string name="loader_error_invalid_format">Impossible de charger la ROM</string>
-    <string name="loader_error_file_not_found">Le fichier ROM n\'existe pas</string>
-
-    <!-- Emulation Menu -->
-    <string name="emulation_exit">Quitter l\'émulation</string>
-    <string name="emulation_done">Terminé</string>
-    <string name="emulation_fps_counter">Compteur FPS</string>
-    <string name="emulation_toggle_controls">Activer/Désactiver les contrôles</string>
-    <string name="emulation_rel_stick_center">Centre du stick relatif</string>
-    <string name="emulation_dpad_slide">Glissement du DPad</string>
-    <string name="emulation_haptics">Haptique</string>
-    <string name="emulation_show_overlay">Afficher l\'overlay</string>
-    <string name="emulation_toggle_all">Tout basculer</string>
-    <string name="emulation_control_adjust">Ajuster l\'overlay</string>
-    <string name="emulation_control_scale">Échelle</string>
-    <string name="emulation_control_opacity">Opacité</string>
-    <string name="emulation_touch_overlay_reset">Réinitialiser l\'overlay</string>
-    <string name="emulation_touch_overlay_edit">Modifier l\'overlay</string>
-    <string name="emulation_pause">Mettre en pause l\'émulation</string>
-    <string name="emulation_unpause">Reprendre l\'émulation</string>
-    <string name="emulation_input_overlay">Options de l\'overlay</string>
-    <string name="emulation_game_loading">Chargement du jeu...</string>
-
-    <string name="load_settings">Chargement des paramètres…</string>
-
-    <!-- Software keyboard -->
-    <string name="software_keyboard">Clavier virtuel</string>
-
-    <!-- Errors and warnings -->
-    <string name="abort_button">Abandonner</string>
-    <string name="continue_button">Continuer</string>
-    <string name="system_archive_not_found">Archive système introuvable</string>
-    <string name="system_archive_not_found_message">%s est manquant. Veuillez dumper vos archives système.\nContinuer peut entraîner des plantages et des bogues.</string>
-    <string name="system_archive_general">Une archive système</string>
-    <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. Consultez les logs pour plus de détails.\nContinuer l\'émulation peut entraîner des plantages et des bogues.</string>
-    <string name="performance_warning">La désactivation de ce paramètre réduira considérablement les performances d\'émulation ! Pour une expérience optimale, il est recommandé de laisser ce paramètre activé.</string>
-
-    <!-- Region Names -->
-    <string name="region_japan">Japon</string>
-    <string name="region_usa">É.-U.A.</string>
-    <string name="region_europe">Europe</string>
-    <string name="region_australia">Australie</string>
-    <string name="region_china">Chine</string>
-    <string name="region_korea">Corée</string>
-    <string name="region_taiwan">Taïwan</string>
-
-    <!-- Language Names -->
-    <string name="language_japanese">Japonais (日本語)</string>
-    <string name="language_english">Anglais</string>
-    <string name="language_french">Français (Français)</string>
-    <string name="langauge_german">Allemand (Deutsch)</string>
-    <string name="language_italian">Italien (Italiano)</string>
-    <string name="language_spanish">Espagnol (Español)</string>
-    <string name="language_chinese">Chinois (简体中文)</string>
-    <string name="language_korean">Coréen (한국어)</string>
-    <string name="language_dutch">Néerlandais (Nederlands)</string>
-    <string name="language_portuguese">Portugais (Português)</string>
-    <string name="language_russian">Russe (Русский)</string>
-    <string name="language_taiwanese">Taïwanais (台湾)</string>
-    <string name="language_british_english">Anglais Britannique</string>
-    <string name="language_canadian_french">Français canadien (Français canadien)</string>
-    <string name="language_latin_american_spanish">Espagnol latino-américain (Español latinoamericano)</string>
-    <string name="language_simplified_chinese">Chinois simplifié (简体中文)</string>
-    <string name="language_traditional_chinese">Chinois Traditionnel (正體中文)</string>
-    <string name="language_brazilian_portuguese">Portugais brésilien (Português do Brasil)</string>
-
-    <!-- Renderer APIs -->
-    <string name="renderer_vulkan">Vulkan</string>
-    <string name="renderer_none">Aucune</string>
-
-    <!-- Renderer Accuracy -->
-    <string name="renderer_accuracy_normal">Normal</string>
-    <string name="renderer_accuracy_high">Haut</string>
-    <string name="renderer_accuracy_extreme">Extrême (Lent)</string>
-
-    <!-- Resolutions -->
-    <string name="resolution_half">0.5X (360p/540p)</string>
-    <string name="resolution_three_quarter">0.75X (540p/810p)</string>
-    <string name="resolution_one">1X (720p/1080p)</string>
-    <string name="resolution_two">2X (1440p/2160p) (Lent)</string>
-    <string name="resolution_three">3X (2160p/3240p) (Lent)</string>
-    <string name="resolution_four">4X (2880p/4320p) (Lent)</string>
-
-    <!-- Renderer VSync -->
-    <string name="renderer_vsync_immediate">Immédiat (Désactivé)</string>
-    <string name="renderer_vsync_mailbox">Mailbox</string>
-    <string name="renderer_vsync_fifo">FIFO (Activé)</string>
-    <string name="renderer_vsync_fifo_relaxed">FIFO souple</string>
-
-    <!-- Scaling Filters -->
-    <string name="scaling_filter_nearest_neighbor">Plus proche voisin</string>
-    <string name="scaling_filter_bilinear">Bilinéaire</string>
-    <string name="scaling_filter_bicubic">Bicubique</string>
-    <string name="scaling_filter_gaussian">Gaussien</string>
-    <string name="scaling_filter_scale_force">ScaleForce</string>
-    <string name="scaling_filter_fsr">AMD FidelityFX™ Super Resolution</string>
-
-    <!-- Anti-Aliasing -->
-    <string name="anti_aliasing_none">Aucune</string>
-    <string name="anti_aliasing_fxaa">FXAA</string>
-    <string name="anti_aliasing_smaa">SMAA</string>
-
-    <!-- Aspect Ratios -->
-    <string name="ratio_default">Par défaut (16:9)</string>
-    <string name="ratio_force_four_three">Forcer le 4:3</string>
-    <string name="ratio_force_twenty_one_nine">Forcer le 21:9</string>
-    <string name="ratio_force_sixteen_ten">Forcer le 16:10</string>
-    <string name="ratio_stretch">Étirer à la fenêtre</string>
-
-    <!-- CPU Accuracy -->
-    <string name="cpu_accuracy_accurate">Précis</string>
-    <string name="cpu_accuracy_unsafe">Risqué</string>
-    <string name="cpu_accuracy_paranoid">Paranoïaque (Lent)</string>
-
-    <!-- Gamepad Buttons -->
-    <string name="gamepad_d_pad">Pavé directionnel</string>
-    <string name="gamepad_left_stick">Stick Gauche</string>
-    <string name="gamepad_right_stick">Stick Droit</string>
-    <string name="gamepad_home">Home</string>
-    <string name="gamepad_screenshot">Capture d\'écran</string>
-
-    <!-- Disk shader cache -->
-    <string name="preparing_shaders">Préparation des shaders</string>
-    <string name="building_shaders">Compilation des shaders</string>
-
-    <!-- Theme options -->
-    <string name="change_app_theme">Changer le thème de l\'application</string>
-    <string name="theme_default">Défaut</string>
-    <string name="theme_material_you">Material You</string>
-
-    <!-- Theme Modes -->
-    <string name="change_theme_mode">Changer le mode de thème</string>
-    <string name="theme_mode_follow_system">Automatique</string>
-    <string name="theme_mode_light">Lumineux</string>
-    <string name="theme_mode_dark">Sombre</string>
-
-    <!-- Black backgrounds theme -->
-    <string name="use_black_backgrounds">Utiliser des arrière-plans noirs</string>
-    <string name="use_black_backgrounds_description">Lorsque vous utilisez le thème sombre, appliquer des arrière-plans noirs.</string>
-
-</resources>