video_core: optionally skip barriers on feedback loops

.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

@@ -52,6 +52,3 @@
 [submodule "libadrenotools"]
 	path = externals/libadrenotools
 	url = https://github.com/bylaws/libadrenotools
-[submodule "tzdb_to_nx"]
-	path = externals/nx_tzdb/tzdb_to_nx
-	url = https://github.com/lat9nq/tzdb_to_nx.git

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

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)

externals/nx_tzdb/CMakeLists.txt

@@ -1,60 +1,24 @@
 # SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+set(NX_TZDB_VERSION "220816")
+set(NX_TZDB_DOWNLOAD_URL "https://github.com/lat9nq/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip")
+
+set(NX_TZDB_ARCHIVE "${CMAKE_CURRENT_BINARY_DIR}/${NX_TZDB_VERSION}.zip")
+set(NX_TZDB_DIR "${CMAKE_CURRENT_BINARY_DIR}/nx_tzdb")
+
 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()
-
+if (NOT EXISTS ${NX_TZDB_ARCHIVE})
+    file(DOWNLOAD ${NX_TZDB_DOWNLOAD_URL} ${NX_TZDB_ARCHIVE})
     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}")
+            ${NX_TZDB_DIR})
 endif()
 
+add_library(nx_tzdb INTERFACE)
 target_include_directories(nx_tzdb
     INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include
     INTERFACE ${NX_TZDB_INCLUDE_DIR})
@@ -77,25 +41,25 @@ function(CreateHeader ZONE_PATH HEADER_NAME)
     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)
+CreateHeader(${NX_TZDB_DIR} base)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo zoneinfo)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Africa africa)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/America america)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/America/Argentina america_argentina)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/America/Indiana america_indiana)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/America/Kentucky america_kentucky)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/America/North_Dakota america_north_dakota)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Antartica antartica)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Arctic arctic)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Asia asia)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Atlantic atlantic)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Australia australia)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Brazil brazil)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Canada canada)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Chile chile)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Etc etc)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Europe europe)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Indian indian)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Mexico mexico)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/Pacific pacific)
+CreateHeader(${NX_TZDB_DIR}/zoneinfo/US us)

externals/nx_tzdb/NxTzdbCreateHeader.cmake

@@ -15,7 +15,7 @@ set(DIRECTORY_NAME ${HEADER_NAME})
 
 set(FILE_DATA "")
 foreach(ZONE_FILE ${FILE_LIST})
-    if (ZONE_FILE STREQUAL "\n")
+    if ("${ZONE_FILE}" STREQUAL "\n")
         continue()
     endif()
 
@@ -26,13 +26,13 @@ foreach(ZONE_FILE ${FILE_LIST})
     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)
+        string(SUBSTRING "${ZONE_DATA}" "${I}" "2" HEX_DATA)
+        if ("${HEX_DATA}" STREQUAL "")
             break()
         endif()
 
         string(APPEND FILE_DATA "0x${HEX_DATA},")
-        if (BREAK_LINE EQUAL 0)
+        if ("${BREAK_LINE}" STREQUAL "0")
             string(APPEND FILE_DATA "\n")
         else()
             string(APPEND FILE_DATA " ")

externals/nx_tzdb/include/nx_tzdb.h

@@ -9,7 +9,7 @@
 #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/antartica.h"
 #include "nx_tzdb/arctic.h"
 #include "nx_tzdb/asia.h"
 #include "nx_tzdb/atlantic.h"

src/android/app/build.gradle.kts

@@ -2,17 +2,13 @@
 // 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"
 }
 
 /**
@@ -47,6 +43,16 @@ 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"
@@ -160,24 +166,6 @@ 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")

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

@@ -53,9 +53,8 @@ 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"
             android:exported="true">
 
             <intent-filter>

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)
     }
 
     /**
@@ -308,11 +282,6 @@ object NativeLibrary {
      */
     external fun isRunning(): Boolean
 
-    /**
-     * Returns true if emulation is paused.
-     */
-    external fun isPaused(): Boolean
-
     /**
      * Returns the performance stats for the current game
      */
@@ -462,9 +431,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()

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

@@ -4,23 +4,14 @@
 package org.yuzu.yuzu_emu.activities
 
 import android.app.Activity
-import android.app.PendingIntent
-import android.app.PictureInPictureParams
-import android.app.RemoteAction
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
-import android.content.res.Configuration
 import android.graphics.Rect
-import android.graphics.drawable.Icon
 import android.hardware.Sensor
 import android.hardware.SensorEvent
 import android.hardware.SensorEventListener
 import android.hardware.SensorManager
-import android.os.Build
 import android.os.Bundle
-import android.util.Rational
 import android.view.InputDevice
 import android.view.KeyEvent
 import android.view.MotionEvent
@@ -32,27 +23,30 @@ 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 kotlin.math.roundToInt
+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.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.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
 
@@ -61,8 +55,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
     private var motionTimestamp: Long = 0
     private var flipMotionOrientation: Boolean = false
 
-    private val actionPause = "ACTION_EMULATOR_PAUSE"
-    private val actionPlay = "ACTION_EMULATOR_PLAY"
+    private lateinit var game: Game
 
     private val settingsViewModel: SettingsViewModel by viewModels()
 
@@ -77,31 +70,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))
 
+        // 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()
 
+        lifecycleScope.launch(Dispatchers.Main) {
+            lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                WindowInfoTracker.getOrCreate(this@EmulationActivity)
+                    .windowLayoutInfo(this@EmulationActivity)
+                    .collect { emulationFragment?.updateCurrentLayout(this@EmulationActivity, it) }
+            }
+        }
+
         // Start a foreground service to prevent the app from getting killed in the background
         val startIntent = Intent(this, ForegroundService::class.java)
         startForegroundService(startIntent)
@@ -134,8 +143,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         super.onResume()
         nfcReader.startScanning()
         startMotionSensorListener()
-
-        buildPictureInPictureParams()
     }
 
     override fun onPause() {
@@ -144,22 +151,17 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         stopMotionSensorListener()
     }
 
-    override fun onUserLeaveHint() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-            if (BooleanSetting.PICTURE_IN_PICTURE.boolean && !isInPictureInPictureMode) {
-                val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
-                    .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
-                enterPictureInPictureMode(pictureInPictureParamsBuilder.build())
-            }
-        }
-    }
-
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)
         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
@@ -246,6 +248,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)
 
@@ -256,100 +262,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         }
     }
 
-    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
-        }
-        return this.apply { aspectRatio?.let { setAspectRatio(it) } }
-    }
-
-    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 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
-            )
-            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
-            )
-            pictureInPictureActions.add(pauseRemoteAction)
-        }
-
-        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) {
-            if (intent.action == actionPlay) {
-                if (NativeLibrary.isPaused()) NativeLibrary.unPauseEmulation()
-            } else if (intent.action == actionPause) {
-                if (!NativeLibrary.isPaused()) NativeLibrary.pauseEmulation()
-            }
-            buildPictureInPictureParams()
-        }
-    }
-
-    override fun onPictureInPictureModeChanged(
-        isInPictureInPictureMode: Boolean,
-        newConfig: Configuration
-    ) {
-        super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
-        if (isInPictureInPictureMode) {
-            IntentFilter().apply {
-                addAction(actionPause)
-                addAction(actionPlay)
-            }.also {
-                registerReceiver(pictureInPictureReceiver, it)
-            }
-        } else {
-            try {
-                unregisterReceiver(pictureInPictureReceiver)
-            } catch (ignored: Exception) {
-            }
-        }
-    }
-
     private fun startMotionSensorListener() {
         val sensorManager = this.getSystemService(Context.SENSOR_SERVICE) as SensorManager
         val gyroSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE)

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,10 +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);
 
     override var boolean: Boolean = defaultValue
@@ -31,7 +27,6 @@ enum class BooleanSetting(
 
     companion object {
         private val NOT_RUNTIME_EDITABLE = listOf(
-            PICTURE_IN_PICTURE,
             USE_CUSTOM_RTC
         )
 

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

@@ -93,11 +93,6 @@ enum class IntSetting(
         Settings.SECTION_RENDERER,
         0
     ),
-    RENDERER_SCREEN_LAYOUT(
-        "screen_layout",
-        Settings.SECTION_RENDERER,
-        Settings.LayoutOption_MobileLandscape
-    ),
     RENDERER_ASPECT_RATIO(
         "aspect_ratio",
         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
@@ -133,6 +133,7 @@ class Settings {
         const val PREF_MENU_SETTINGS_JOYSTICK_REL_CENTER = "EmulationMenuSettings_JoystickRelCenter"
         const val PREF_MENU_SETTINGS_DPAD_SLIDE = "EmulationMenuSettings_DpadSlideEnable"
         const val PREF_MENU_SETTINGS_HAPTICS = "EmulationMenuSettings_Haptics"
+        const val PREF_MENU_SETTINGS_LANDSCAPE = "EmulationMenuSettings_LandscapeScreenLayout"
         const val PREF_MENU_SETTINGS_SHOW_FPS = "EmulationMenuSettings_ShowFps"
         const val PREF_MENU_SETTINGS_SHOW_OVERLAY = "EmulationMenuSettings_ShowOverlay"
 
@@ -143,10 +144,6 @@ class Settings {
 
         private val configFileSectionsMap: MutableMap<String, List<String>> = HashMap()
 
-        const val LayoutOption_Unspecified = 0
-        const val LayoutOption_MobilePortrait = 4
-        const val LayoutOption_MobileLandscape = 5
-
         init {
             configFileSectionsMap[SettingsFile.FILE_NAME_CONFIG] =
                 listOf(

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,17 @@ 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.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 +29,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 +59,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 +75,7 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
             this,
             object : OnBackPressedCallback(true) {
                 override fun handleOnBackPressed() = navigateBack()
-            }
-        )
+            })
 
         setInsets()
     }
@@ -151,13 +148,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 +207,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(
@@ -246,17 +239,5 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
             settings.putExtra(ARG_GAME_ID, gameId)
             context.startActivity(settings)
         }
-
-        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)
-            launcher.launch(settings)
-        }
     }
 }

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
         }
 
@@ -165,15 +166,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.CPU_ACCURACY.defaultValue
                 )
             )
-            add(
-                SwitchSetting(
-                    BooleanSetting.PICTURE_IN_PICTURE,
-                    R.string.picture_in_picture,
-                    R.string.picture_in_picture_description,
-                    BooleanSetting.PICTURE_IN_PICTURE.key,
-                    BooleanSetting.PICTURE_IN_PICTURE.defaultValue
-                )
-            )
         }
     }
 
@@ -235,6 +227,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,
@@ -290,17 +283,6 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
                     IntSetting.RENDERER_ANTI_ALIASING.defaultValue
                 )
             )
-            add(
-                SingleChoiceSetting(
-                    IntSetting.RENDERER_SCREEN_LAYOUT,
-                    R.string.renderer_screen_layout,
-                    0,
-                    R.array.rendererScreenLayoutNames,
-                    R.array.rendererScreenLayoutValues,
-                    IntSetting.RENDERER_SCREEN_LAYOUT.key,
-                    IntSetting.RENDERER_SCREEN_LAYOUT.defaultValue
-                )
-            )
             add(
                 SingleChoiceSetting(
                     IntSetting.RENDERER_ASPECT_RATIO,
@@ -353,31 +335,18 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
 
     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 +449,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 +469,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

@@ -7,39 +7,30 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
 import android.content.DialogInterface
-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.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.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 +41,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,30 +54,13 @@ 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 onReturnFromSettings: ActivityResultLauncher<Intent>
+    private lateinit var game: Game
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         if (context is EmulationActivity) {
             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() }
         } else {
             throw IllegalStateException("EmulationFragment must have EmulationActivity parent")
         }
@@ -100,7 +75,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 +100,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 -> {
@@ -149,12 +125,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 }
 
                 R.id.menu_settings -> {
-                    SettingsActivity.launch(
-                        requireContext(),
-                        onReturnFromSettings,
-                        SettingsFile.FILE_NAME_CONFIG,
-                        ""
-                    )
+                    SettingsActivity.launch(requireContext(), SettingsFile.FILE_NAME_CONFIG, "")
                     true
                 }
 
@@ -179,48 +150,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() {
@@ -229,7 +161,16 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             DirectoryInitialization.start(requireContext())
         }
 
-        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)
+            }
+        )
 
         emulationState.run(emulationActivity!!.isActivityRecreated)
     }
@@ -290,72 +231,31 @@ 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 val Number.toPx get() = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), Resources.getSystem().displayMetrics).toInt()
 
-    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()
-                    }
+    fun updateCurrentLayout(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
+            }
+            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.surfaceEmulation.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
             binding.inGameMenu.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
-            isInFoldableLayout = false
-            updateOrientation()
-            onConfigurationChanged(resources.configuration)
+            binding.overlayContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT
+            binding.overlayContainer.updatePadding(0, 0, 0, 0)
+            emulationActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
         }
-        binding.emulationContainer.requestLayout()
-        binding.inputContainer.requestLayout()
-        binding.overlayContainer.requestLayout()
+        binding.surfaceInputOverlay.requestLayout()
         binding.inGameMenu.requestLayout()
+        binding.overlayContainer.requestLayout()
     }
 
     override fun surfaceCreated(holder: SurfaceHolder) {
@@ -485,19 +385,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 +393,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 +402,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 +445,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 +565,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.")
                 }
             }
         }
@@ -729,5 +601,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

@@ -103,9 +103,7 @@ class HomeSettingsFragment : Fragment() {
                 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)
-            },
+            ) { mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data) },
             HomeSetting(
                 R.string.manage_save_data,
                 R.string.import_export_saves_description,
@@ -227,11 +225,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
     }
 
@@ -313,9 +307,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/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
@@ -30,6 +29,8 @@ 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
@@ -129,15 +130,15 @@ class SearchFragment : Fragment() {
             R.id.chip_homebrew -> baseList.filter { it.isHomebrew }
 
             R.id.chip_retail -> baseList.filter {
-                FileUtil.hasExtension(it.path, "xci") ||
-                    FileUtil.hasExtension(it.path, "nsp")
+                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
@@ -172,16 +173,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
@@ -23,9 +23,8 @@ class Game(
     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()
     }

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

@@ -10,7 +10,6 @@ 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
@@ -21,6 +20,7 @@ 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() {
@@ -99,9 +99,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
@@ -877,16 +768,10 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
             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()
-                    }
+                    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
@@ -993,8 +878,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 +959,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 +1026,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

@@ -26,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
@@ -46,6 +43,9 @@ 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
@@ -86,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(
@@ -174,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)
@@ -193,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)
@@ -240,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
@@ -264,9 +256,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     val getGamesDirectory =
         registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->
-            if (result == null) {
+            if (result == null)
                 return@registerForActivityResult
-            }
 
             contentResolver.takePersistableUriPermission(
                 result,
@@ -290,9 +281,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     val getProdKey =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
+            if (result == null)
                 return@registerForActivityResult
-            }
 
             if (!FileUtil.hasExtension(result, "keys")) {
                 MessageDialogFragment.newInstance(
@@ -334,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) {
@@ -387,9 +376,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     val getAmiiboKey =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
-            if (result == null) {
+            if (result == null)
                 return@registerForActivityResult
-            }
 
             if (!FileUtil.hasExtension(result, "bin")) {
                 MessageDialogFragment.newInstance(
@@ -430,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
@@ -483,9 +470,8 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
 
     val installGameUpdate =
         registerForActivityResult(ActivityResultContracts.OpenDocument()) {
-            if (it == null) {
+            if (it == null)
                 return@registerForActivityResult
-            }
 
             IndeterminateProgressDialogFragment.newInstance(
                 this@MainActivity,

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/EmulationMenuSettings.kt

@@ -11,6 +11,14 @@ object EmulationMenuSettings {
     private val preferences =
         PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
 
+    // 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
+
     var joystickRelCenter: Boolean
         get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_JOYSTICK_REL_CENTER, true)
         set(value) {
@@ -33,6 +41,16 @@ object EmulationMenuSettings {
                 .apply()
         }
 
+    var landscapeScreenLayout: Int
+        get() = preferences.getInt(
+            Settings.PREF_MENU_SETTINGS_LANDSCAPE,
+            LayoutOption_MobileLandscape
+        )
+        set(value) {
+            preferences.edit()
+                .putInt(Settings.PREF_MENU_SETTINGS_LANDSCAPE, value)
+                .apply()
+        }
     var showFps: Boolean
         get() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_SHOW_FPS, false)
         set(value) {

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

@@ -9,6 +9,8 @@ import android.net.Uri
 import android.provider.DocumentsContract
 import android.provider.OpenableColumns
 import androidx.documentfile.provider.DocumentFile
+import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.model.MinimalDocumentFile
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileOutputStream
@@ -17,8 +19,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"

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,12 +6,12 @@ package org.yuzu.yuzu_emu.utils
 import android.content.SharedPreferences
 import android.net.Uri
 import androidx.preference.PreferenceManager
-import java.util.*
 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"

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"

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/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

@@ -38,8 +38,8 @@ class FixedRatioSurfaceView @JvmOverloads constructor(
                 newWidth = width
                 newHeight = (width / aspectRatio).roundToInt()
             }
-            val left = (width - newWidth) / 2
-            val top = (height - newHeight) / 2
+            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/native.cpp

@@ -202,11 +202,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;
@@ -292,13 +287,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() {
@@ -480,7 +473,6 @@ private:
     std::shared_ptr<FileSys::VfsFilesystem> 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;
 
@@ -591,11 +583,6 @@ jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isRunning([[maybe_unused]] JNIEnv
     return static_cast<jboolean>(EmulationSession::GetInstance().IsRunning());
 }
 
-jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isPaused([[maybe_unused]] JNIEnv* env,
-                                                        [[maybe_unused]] jclass clazz) {
-    return static_cast<jboolean>(EmulationSession::GetInstance().IsPaused());
-}
-
 jboolean Java_org_yuzu_yuzu_1emu_NativeLibrary_isHandheldOnly([[maybe_unused]] JNIEnv* env,
                                                               [[maybe_unused]] jclass clazz) {
     return EmulationSession::GetInstance().IsHandheldOnly();

src/android/app/src/main/res/drawable/ic_pip_pause.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="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
-</vector>

src/android/app/src/main/res/drawable/ic_pip_play.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="M8,5v14l11,-7z" />
-</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,65 +12,49 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <FrameLayout
-            android:id="@+id/emulation_container"
-            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>
-
-        <FrameLayout
-            android:id="@+id/input_container"
+        <!-- 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="bottom">
-
-            <!-- This is the onscreen input overlay -->
-            <org.yuzu.yuzu_emu.overlay.InputOverlay
-                android:id="@+id/surface_input_overlay"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                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>
+            android:layout_gravity="center"
+            android:focusable="false"
+            android:focusableInTouchMode="false" />
 
         <FrameLayout
             android:id="@+id/overlay_container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:layout_gravity="bottom">
 
-            <TextView
-                android:id="@+id/show_fps_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:clickable="false"
-                android:focusable="false"
-                android:shadowColor="@android:color/black"
-                android:textColor="@android:color/white"
-                android:textSize="12sp"
-                tools:ignore="RtlHardcoded" />
+        <!-- This is the onscreen input overlay -->
+        <org.yuzu.yuzu_emu.overlay.InputOverlay
+            android:id="@+id/surface_input_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="true"
+            android:focusableInTouchMode="true" />
 
+        <TextView
+            android:id="@+id/show_fps_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:clickable="false"
+            android:focusable="false"
+            android:shadowColor="@android:color/black"
+            android:textColor="@android:color/white"
+            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/arrays.xml

@@ -119,18 +119,6 @@
         <item>3</item>
     </integer-array>
 
-    <string-array name="rendererScreenLayoutNames">
-        <item>@string/screen_layout_landscape</item>
-        <item>@string/screen_layout_portrait</item>
-        <item>@string/screen_layout_auto</item>
-    </string-array>
-
-    <integer-array name="rendererScreenLayoutValues">
-        <item>5</item>
-        <item>4</item>
-        <item>0</item>
-    </integer-array>
-
     <string-array name="rendererAspectRatioNames">
         <item>@string/ratio_default</item>
         <item>@string/ratio_force_four_three</item>
@@ -236,15 +224,4 @@
         <item>2</item>
     </integer-array>
 
-    <string-array name="outputEngineEntries">
-        <item>@string/auto</item>
-        <item>@string/cubeb</item>
-        <item>@string/string_null</item>
-    </string-array>
-    <string-array name="outputEngineValues">
-        <item>auto</item>
-        <item>cubeb</item>
-        <item>null</item>
-    </string-array>
-
 </resources>

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

@@ -34,68 +34,4 @@
     <integer name="SWITCH_BUTTON_DPAD_X">260</integer>
     <integer name="SWITCH_BUTTON_DPAD_Y">790</integer>
 
-    <!-- Default SWITCH portrait layout -->
-    <integer name="SWITCH_BUTTON_A_X_PORTRAIT">840</integer>
-    <integer name="SWITCH_BUTTON_A_Y_PORTRAIT">840</integer>
-    <integer name="SWITCH_BUTTON_B_X_PORTRAIT">740</integer>
-    <integer name="SWITCH_BUTTON_B_Y_PORTRAIT">880</integer>
-    <integer name="SWITCH_BUTTON_X_X_PORTRAIT">740</integer>
-    <integer name="SWITCH_BUTTON_X_Y_PORTRAIT">800</integer>
-    <integer name="SWITCH_BUTTON_Y_X_PORTRAIT">640</integer>
-    <integer name="SWITCH_BUTTON_Y_Y_PORTRAIT">840</integer>
-    <integer name="SWITCH_STICK_L_X_PORTRAIT">180</integer>
-    <integer name="SWITCH_STICK_L_Y_PORTRAIT">660</integer>
-    <integer name="SWITCH_STICK_R_X_PORTRAIT">820</integer>
-    <integer name="SWITCH_STICK_R_Y_PORTRAIT">660</integer>
-    <integer name="SWITCH_TRIGGER_L_X_PORTRAIT">140</integer>
-    <integer name="SWITCH_TRIGGER_L_Y_PORTRAIT">260</integer>
-    <integer name="SWITCH_TRIGGER_R_X_PORTRAIT">860</integer>
-    <integer name="SWITCH_TRIGGER_R_Y_PORTRAIT">260</integer>
-    <integer name="SWITCH_TRIGGER_ZL_X_PORTRAIT">140</integer>
-    <integer name="SWITCH_TRIGGER_ZL_Y_PORTRAIT">200</integer>
-    <integer name="SWITCH_TRIGGER_ZR_X_PORTRAIT">860</integer>
-    <integer name="SWITCH_TRIGGER_ZR_Y_PORTRAIT">200</integer>
-    <integer name="SWITCH_BUTTON_MINUS_X_PORTRAIT">440</integer>
-    <integer name="SWITCH_BUTTON_MINUS_Y_PORTRAIT">950</integer>
-    <integer name="SWITCH_BUTTON_PLUS_X_PORTRAIT">560</integer>
-    <integer name="SWITCH_BUTTON_PLUS_Y_PORTRAIT">950</integer>
-    <integer name="SWITCH_BUTTON_HOME_X_PORTRAIT">680</integer>
-    <integer name="SWITCH_BUTTON_HOME_Y_PORTRAIT">950</integer>
-    <integer name="SWITCH_BUTTON_CAPTURE_X_PORTRAIT">320</integer>
-    <integer name="SWITCH_BUTTON_CAPTURE_Y_PORTRAIT">950</integer>
-    <integer name="SWITCH_BUTTON_DPAD_X_PORTRAIT">240</integer>
-    <integer name="SWITCH_BUTTON_DPAD_Y_PORTRAIT">840</integer>
-
-    <!-- Default SWITCH foldable layout -->
-    <integer name="SWITCH_BUTTON_A_X_FOLDABLE">840</integer>
-    <integer name="SWITCH_BUTTON_A_Y_FOLDABLE">390</integer>
-    <integer name="SWITCH_BUTTON_B_X_FOLDABLE">740</integer>
-    <integer name="SWITCH_BUTTON_B_Y_FOLDABLE">430</integer>
-    <integer name="SWITCH_BUTTON_X_X_FOLDABLE">740</integer>
-    <integer name="SWITCH_BUTTON_X_Y_FOLDABLE">350</integer>
-    <integer name="SWITCH_BUTTON_Y_X_FOLDABLE">640</integer>
-    <integer name="SWITCH_BUTTON_Y_Y_FOLDABLE">390</integer>
-    <integer name="SWITCH_STICK_L_X_FOLDABLE">180</integer>
-    <integer name="SWITCH_STICK_L_Y_FOLDABLE">250</integer>
-    <integer name="SWITCH_STICK_R_X_FOLDABLE">820</integer>
-    <integer name="SWITCH_STICK_R_Y_FOLDABLE">250</integer>
-    <integer name="SWITCH_TRIGGER_L_X_FOLDABLE">140</integer>
-    <integer name="SWITCH_TRIGGER_L_Y_FOLDABLE">130</integer>
-    <integer name="SWITCH_TRIGGER_R_X_FOLDABLE">860</integer>
-    <integer name="SWITCH_TRIGGER_R_Y_FOLDABLE">130</integer>
-    <integer name="SWITCH_TRIGGER_ZL_X_FOLDABLE">140</integer>
-    <integer name="SWITCH_TRIGGER_ZL_Y_FOLDABLE">70</integer>
-    <integer name="SWITCH_TRIGGER_ZR_X_FOLDABLE">860</integer>
-    <integer name="SWITCH_TRIGGER_ZR_Y_FOLDABLE">70</integer>
-    <integer name="SWITCH_BUTTON_MINUS_X_FOLDABLE">440</integer>
-    <integer name="SWITCH_BUTTON_MINUS_Y_FOLDABLE">470</integer>
-    <integer name="SWITCH_BUTTON_PLUS_X_FOLDABLE">560</integer>
-    <integer name="SWITCH_BUTTON_PLUS_Y_FOLDABLE">470</integer>
-    <integer name="SWITCH_BUTTON_HOME_X_FOLDABLE">680</integer>
-    <integer name="SWITCH_BUTTON_HOME_Y_FOLDABLE">470</integer>
-    <integer name="SWITCH_BUTTON_CAPTURE_X_FOLDABLE">320</integer>
-    <integer name="SWITCH_BUTTON_CAPTURE_Y_FOLDABLE">470</integer>
-    <integer name="SWITCH_BUTTON_DPAD_X_FOLDABLE">240</integer>
-    <integer name="SWITCH_BUTTON_DPAD_Y_FOLDABLE">390</integer>
-
 </resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+<resources>
 
     <!-- General application strings -->
     <string name="app_name" translatable="false">yuzu</string>
@@ -158,10 +158,10 @@
     <string name="set_custom_rtc">Set custom RTC</string>
 
     <!-- Graphics settings strings -->
+    <string name="renderer_api">API</string>
     <string name="renderer_accuracy">Accuracy level</string>
     <string name="renderer_resolution">Resolution (Handheld/Docked)</string>
     <string name="renderer_vsync">VSync mode</string>
-    <string name="renderer_screen_layout">Orientation</string>
     <string name="renderer_aspect_ratio">Aspect ratio</string>
     <string name="renderer_scaling_filter">Window adapting filter</string>
     <string name="renderer_anti_aliasing">Anti-aliasing method</string>
@@ -171,21 +171,12 @@
     <string name="renderer_asynchronous_shaders_description">Compiles shaders asynchronously, reducing stutter but may introduce glitches.</string>
     <string name="renderer_reactive_flushing">Use reactive flushing</string>
     <string name="renderer_reactive_flushing_description">Improves rendering accuracy in some games at the cost of performance.</string>
+    <string name="renderer_debug">Graphics debugging</string>
+    <string name="renderer_debug_description">Sets the graphics API to a slow debugging mode.</string>
     <string name="use_disk_shader_cache">Disk shader cache</string>
     <string name="use_disk_shader_cache_description">Reduces stuttering by locally storing and loading generated shaders.</string>
 
-    <!-- Debug settings strings -->
-    <string name="cpu">CPU</string>
-    <string name="cpu_debug_mode">CPU Debugging</string>
-    <string name="cpu_debug_mode_description">Puts the CPU in a slow debugging mode.</string>
-    <string name="gpu">GPU</string>
-    <string name="renderer_api">API</string>
-    <string name="renderer_debug">Graphics debugging</string>
-    <string name="renderer_debug_description">Sets the graphics API to a slow debugging mode.</string>
-    <string name="fastmem">Fastmem</string>
-
     <!-- Audio settings strings -->
-    <string name="audio_output_engine">Output engine</string>
     <string name="audio_volume">Volume</string>
     <string name="audio_volume_description">Specifies the volume of audio output.</string>
 
@@ -204,7 +195,6 @@
     <string name="learn_more">Learn more</string>
     <string name="auto">Auto</string>
     <string name="submit">Submit</string>
-    <string name="string_null">Null</string>
 
     <!-- GPU driver installation -->
     <string name="select_gpu_driver">Select GPU driver</string>
@@ -336,11 +326,6 @@
     <string name="anti_aliasing_fxaa">FXAA</string>
     <string name="anti_aliasing_smaa">SMAA</string>
 
-    <!-- Screen Layouts -->
-    <string name="screen_layout_landscape">Landscape</string>
-    <string name="screen_layout_portrait">Portrait</string>
-    <string name="screen_layout_auto">Auto</string>
-
     <!-- Aspect Ratios -->
     <string name="ratio_default">Default (16:9)</string>
     <string name="ratio_force_four_three">Force 4:3</string>
@@ -375,19 +360,10 @@
     <string name="theme_mode_light">Light</string>
     <string name="theme_mode_dark">Dark</string>
 
-    <!-- Audio output engines -->
-    <string name="cubeb">cubeb</string>
-
     <!-- Black backgrounds theme -->
     <string name="use_black_backgrounds">Black backgrounds</string>
     <string name="use_black_backgrounds_description">When using the dark theme, apply black backgrounds.</string>
 
-    <!-- Picture-In-Picture -->
-    <string name="picture_in_picture">Picture in Picture</string>
-    <string name="picture_in_picture_description">Minimize window when placed in the background</string>
-    <string name="pause">Pause</string>
-    <string name="play">Play</string>
-
     <!-- Licenses screen strings -->
     <string name="licenses">Licenses</string>
     <string name="license_fidelityfx_fsr" translatable="false">FidelityFX-FSR</string>

src/android/build.gradle.kts

@@ -11,12 +11,3 @@ plugins {
 tasks.register("clean").configure {
     delete(rootProject.buildDir)
 }
-
-buildscript {
-    repositories {
-        google()
-    }
-    dependencies {
-        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.6.0")
-    }
-}

src/common/fs/fs.cpp

@@ -3,9 +3,6 @@
 
 #include "common/fs/file.h"
 #include "common/fs/fs.h"
-#ifdef ANDROID
-#include "common/fs/fs_android.h"
-#endif
 #include "common/fs/path_util.h"
 #include "common/logging/log.h"
 
@@ -528,39 +525,15 @@ void IterateDirEntriesRecursively(const std::filesystem::path& path,
 // Generic Filesystem Operations
 
 bool Exists(const fs::path& path) {
-#ifdef ANDROID
-    if (Android::IsContentUri(path)) {
-        return Android::Exists(path);
-    } else {
-        return fs::exists(path);
-    }
-#else
     return fs::exists(path);
-#endif
 }
 
 bool IsFile(const fs::path& path) {
-#ifdef ANDROID
-    if (Android::IsContentUri(path)) {
-        return !Android::IsDirectory(path);
-    } else {
-        return fs::is_regular_file(path);
-    }
-#else
     return fs::is_regular_file(path);
-#endif
 }
 
 bool IsDir(const fs::path& path) {
-#ifdef ANDROID
-    if (Android::IsContentUri(path)) {
-        return Android::IsDirectory(path);
-    } else {
-        return fs::is_directory(path);
-    }
-#else
     return fs::is_directory(path);
-#endif
 }
 
 fs::path GetCurrentDir() {

src/common/fs/fs_android.h

@@ -12,10 +12,7 @@
       "openContentUri", "(Ljava/lang/String;Ljava/lang/String;)I")
 
 #define ANDROID_SINGLE_PATH_DETERMINE_FUNCTIONS(V)                                                 \
-    V(GetSize, std::uint64_t, get_size, CallStaticLongMethod, "getSize", "(Ljava/lang/String;)J")  \
-    V(IsDirectory, bool, is_directory, CallStaticBooleanMethod, "isDirectory",                     \
-      "(Ljava/lang/String;)Z")                                                                     \
-    V(Exists, bool, file_exists, CallStaticBooleanMethod, "exists", "(Ljava/lang/String;)Z")
+    V(GetSize, std::uint64_t, get_size, CallStaticLongMethod, "getSize", "(Ljava/lang/String;)J")
 
 namespace Common::FS::Android {
 

src/common/settings.h

@@ -483,6 +483,7 @@ struct Values {
         AstcRecompression::Uncompressed, AstcRecompression::Uncompressed, AstcRecompression::Bc3,
         "astc_recompression"};
     SwitchableSetting<bool> use_video_framerate{false, "use_video_framerate"};
+    SwitchableSetting<bool> barrier_feedback_loops{true, "barrier_feedback_loops"};
 
     SwitchableSetting<u8> bg_red{0, "bg_red"};
     SwitchableSetting<u8> bg_green{0, "bg_green"};

src/core/file_sys/system_archive/time_zone_binary.cpp

@@ -15,7 +15,7 @@ namespace FileSys::SystemArchive {
 const static std::map<std::string, const std::map<const char*, const std::vector<u8>>&>
     tzdb_zoneinfo_dirs = {{"Africa", NxTzdb::africa},
                           {"America", NxTzdb::america},
-                          {"Antarctica", NxTzdb::antarctica},
+                          {"Antartica", NxTzdb::antartica},
                           {"Arctic", NxTzdb::arctic},
                           {"Asia", NxTzdb::asia},
                           {"Atlantic", NxTzdb::atlantic},

src/core/file_sys/vfs_real.cpp

@@ -25,8 +25,6 @@ namespace FS = Common::FS;
 
 namespace {
 
-constexpr size_t MaxOpenFiles = 512;
-
 constexpr FS::FileAccessMode ModeFlagsToFileAccessMode(Mode mode) {
     switch (mode) {
     case Mode::Read:
@@ -75,30 +73,28 @@ VfsEntryType RealVfsFilesystem::GetEntryType(std::string_view path_) const {
 VirtualFile RealVfsFilesystem::OpenFile(std::string_view path_, Mode perms) {
     const auto path = FS::SanitizePath(path_, FS::DirectorySeparator::PlatformDefault);
 
-    if (auto it = cache.find(path); it != cache.end()) {
-        if (auto file = it->second.lock(); file) {
-            return file;
+    if (const auto weak_iter = cache.find(path); weak_iter != cache.cend()) {
+        const auto& weak = weak_iter->second;
+
+        if (!weak.expired()) {
+            return std::shared_ptr<RealVfsFile>(new RealVfsFile(*this, weak.lock(), path, perms));
         }
     }
 
-    if (!FS::Exists(path) || !FS::IsFile(path)) {
+    auto backing = FS::FileOpen(path, ModeFlagsToFileAccessMode(perms), FS::FileType::BinaryFile);
+
+    if (!backing) {
         return nullptr;
     }
 
-    auto reference = std::make_unique<FileReference>();
-    this->InsertReferenceIntoList(*reference);
+    cache.insert_or_assign(path, std::move(backing));
 
-    auto file =
-        std::shared_ptr<RealVfsFile>(new RealVfsFile(*this, std::move(reference), path, perms));
-    cache[path] = file;
-
-    return file;
+    // Cannot use make_shared as RealVfsFile constructor is private
+    return std::shared_ptr<RealVfsFile>(new RealVfsFile(*this, backing, path, perms));
 }
 
 VirtualFile RealVfsFilesystem::CreateFile(std::string_view path_, Mode perms) {
     const auto path = FS::SanitizePath(path_, FS::DirectorySeparator::PlatformDefault);
-    cache.erase(path);
-
     // Current usages of CreateFile expect to delete the contents of an existing file.
     if (FS::IsFile(path)) {
         FS::IOFile temp{path, FS::FileAccessMode::Write, FS::FileType::BinaryFile};
@@ -127,22 +123,51 @@ VirtualFile RealVfsFilesystem::CopyFile(std::string_view old_path_, std::string_
 VirtualFile RealVfsFilesystem::MoveFile(std::string_view old_path_, std::string_view new_path_) {
     const auto old_path = FS::SanitizePath(old_path_, FS::DirectorySeparator::PlatformDefault);
     const auto new_path = FS::SanitizePath(new_path_, FS::DirectorySeparator::PlatformDefault);
-    cache.erase(old_path);
-    cache.erase(new_path);
-    if (!FS::RenameFile(old_path, new_path)) {
+    const auto cached_file_iter = cache.find(old_path);
+
+    if (cached_file_iter != cache.cend()) {
+        auto file = cached_file_iter->second.lock();
+
+        if (!cached_file_iter->second.expired()) {
+            file->Close();
+        }
+
+        if (!FS::RenameFile(old_path, new_path)) {
+            return nullptr;
+        }
+
+        cache.erase(old_path);
+        file->Open(new_path, FS::FileAccessMode::Read, FS::FileType::BinaryFile);
+        if (file->IsOpen()) {
+            cache.insert_or_assign(new_path, std::move(file));
+        } else {
+            LOG_ERROR(Service_FS, "Failed to open path {} in order to re-cache it", new_path);
+        }
+    } else {
+        ASSERT(false);
         return nullptr;
     }
+
     return OpenFile(new_path, Mode::ReadWrite);
 }
 
 bool RealVfsFilesystem::DeleteFile(std::string_view path_) {
     const auto path = FS::SanitizePath(path_, FS::DirectorySeparator::PlatformDefault);
-    cache.erase(path);
+    const auto cached_iter = cache.find(path);
+
+    if (cached_iter != cache.cend()) {
+        if (!cached_iter->second.expired()) {
+            cached_iter->second.lock()->Close();
+        }
+        cache.erase(path);
+    }
+
     return FS::RemoveFile(path);
 }
 
 VirtualDir RealVfsFilesystem::OpenDirectory(std::string_view path_, Mode perms) {
     const auto path = FS::SanitizePath(path_, FS::DirectorySeparator::PlatformDefault);
+    // Cannot use make_shared as RealVfsDirectory constructor is private
     return std::shared_ptr<RealVfsDirectory>(new RealVfsDirectory(*this, path, perms));
 }
 
@@ -151,6 +176,7 @@ VirtualDir RealVfsFilesystem::CreateDirectory(std::string_view path_, Mode perms
     if (!FS::CreateDirs(path)) {
         return nullptr;
     }
+    // Cannot use make_shared as RealVfsDirectory constructor is private
     return std::shared_ptr<RealVfsDirectory>(new RealVfsDirectory(*this, path, perms));
 }
 
@@ -168,102 +194,73 @@ VirtualDir RealVfsFilesystem::MoveDirectory(std::string_view old_path_,
     if (!FS::RenameDir(old_path, new_path)) {
         return nullptr;
     }
+
+    for (auto& kv : cache) {
+        // If the path in the cache doesn't start with old_path, then bail on this file.
+        if (kv.first.rfind(old_path, 0) != 0) {
+            continue;
+        }
+
+        const auto file_old_path =
+            FS::SanitizePath(kv.first, FS::DirectorySeparator::PlatformDefault);
+        auto file_new_path = FS::SanitizePath(new_path + '/' + kv.first.substr(old_path.size()),
+                                              FS::DirectorySeparator::PlatformDefault);
+        const auto& cached = cache[file_old_path];
+
+        if (cached.expired()) {
+            continue;
+        }
+
+        auto file = cached.lock();
+        cache.erase(file_old_path);
+        file->Open(file_new_path, FS::FileAccessMode::Read, FS::FileType::BinaryFile);
+        if (file->IsOpen()) {
+            cache.insert_or_assign(std::move(file_new_path), std::move(file));
+        } else {
+            LOG_ERROR(Service_FS, "Failed to open path {} in order to re-cache it", file_new_path);
+        }
+    }
+
     return OpenDirectory(new_path, Mode::ReadWrite);
 }
 
 bool RealVfsFilesystem::DeleteDirectory(std::string_view path_) {
     const auto path = FS::SanitizePath(path_, FS::DirectorySeparator::PlatformDefault);
+
+    for (auto& kv : cache) {
+        // If the path in the cache doesn't start with path, then bail on this file.
+        if (kv.first.rfind(path, 0) != 0) {
+            continue;
+        }
+
+        const auto& entry = cache[kv.first];
+        if (!entry.expired()) {
+            entry.lock()->Close();
+        }
+
+        cache.erase(kv.first);
+    }
+
     return FS::RemoveDirRecursively(path);
 }
 
-void RealVfsFilesystem::RefreshReference(const std::string& path, Mode perms,
-                                         FileReference& reference) {
-    // Temporarily remove from list.
-    this->RemoveReferenceFromList(reference);
-
-    // Restore file if needed.
-    if (!reference.file) {
-        this->EvictSingleReference();
-
-        reference.file =
-            FS::FileOpen(path, ModeFlagsToFileAccessMode(perms), FS::FileType::BinaryFile);
-        if (reference.file) {
-            num_open_files++;
-        }
-    }
-
-    // Reinsert into list.
-    this->InsertReferenceIntoList(reference);
-}
-
-void RealVfsFilesystem::DropReference(std::unique_ptr<FileReference>&& reference) {
-    // Remove from list.
-    this->RemoveReferenceFromList(*reference);
-
-    // Close the file.
-    if (reference->file) {
-        reference->file.reset();
-        num_open_files--;
-    }
-}
-
-void RealVfsFilesystem::EvictSingleReference() {
-    if (num_open_files < MaxOpenFiles || open_references.empty()) {
-        return;
-    }
-
-    // Get and remove from list.
-    auto& reference = open_references.back();
-    this->RemoveReferenceFromList(reference);
-
-    // Close the file.
-    if (reference.file) {
-        reference.file.reset();
-        num_open_files--;
-    }
-
-    // Reinsert into closed list.
-    this->InsertReferenceIntoList(reference);
-}
-
-void RealVfsFilesystem::InsertReferenceIntoList(FileReference& reference) {
-    if (reference.file) {
-        open_references.push_front(reference);
-    } else {
-        closed_references.push_front(reference);
-    }
-}
-
-void RealVfsFilesystem::RemoveReferenceFromList(FileReference& reference) {
-    if (reference.file) {
-        open_references.erase(open_references.iterator_to(reference));
-    } else {
-        closed_references.erase(closed_references.iterator_to(reference));
-    }
-}
-
-RealVfsFile::RealVfsFile(RealVfsFilesystem& base_, std::unique_ptr<FileReference> reference_,
+RealVfsFile::RealVfsFile(RealVfsFilesystem& base_, std::shared_ptr<FS::IOFile> backing_,
                          const std::string& path_, Mode perms_)
-    : base(base_), reference(std::move(reference_)), path(path_),
-      parent_path(FS::GetParentPath(path_)), path_components(FS::SplitPathComponents(path_)),
-      perms(perms_) {}
+    : base(base_), backing(std::move(backing_)), path(path_), parent_path(FS::GetParentPath(path_)),
+      path_components(FS::SplitPathComponents(path_)), perms(perms_) {}
 
-RealVfsFile::~RealVfsFile() {
-    base.DropReference(std::move(reference));
-}
+RealVfsFile::~RealVfsFile() = default;
 
 std::string RealVfsFile::GetName() const {
     return path_components.back();
 }
 
 std::size_t RealVfsFile::GetSize() const {
-    base.RefreshReference(path, perms, *reference);
-    return reference->file ? reference->file->GetSize() : 0;
+    return backing->GetSize();
 }
 
 bool RealVfsFile::Resize(std::size_t new_size) {
-    base.RefreshReference(path, perms, *reference);
-    return reference->file ? reference->file->SetSize(new_size) : false;
+    return backing->SetSize(new_size);
 }
 
 VirtualDir RealVfsFile::GetContainingDirectory() const {
@@ -279,25 +276,27 @@ bool RealVfsFile::IsReadable() const {
 }
 
 std::size_t RealVfsFile::Read(u8* data, std::size_t length, std::size_t offset) const {
-    base.RefreshReference(path, perms, *reference);
-    if (!reference->file || !reference->file->Seek(static_cast<s64>(offset))) {
+    if (!backing->Seek(static_cast<s64>(offset))) {
         return 0;
     }
-    return reference->file->ReadSpan(std::span{data, length});
+    return backing->ReadSpan(std::span{data, length});
 }
 
 std::size_t RealVfsFile::Write(const u8* data, std::size_t length, std::size_t offset) {
-    base.RefreshReference(path, perms, *reference);
-    if (!reference->file || !reference->file->Seek(static_cast<s64>(offset))) {
+    if (!backing->Seek(static_cast<s64>(offset))) {
         return 0;
     }
-    return reference->file->WriteSpan(std::span{data, length});
+    return backing->WriteSpan(std::span{data, length});
 }
 
 bool RealVfsFile::Rename(std::string_view name) {
     return base.MoveFile(path, parent_path + '/' + std::string(name)) != nullptr;
 }
 
+void RealVfsFile::Close() {
+    backing->Close();
+}
+
 // TODO(DarkLordZach): MSVC would not let me combine the following two functions using 'if
 // constexpr' because there is a compile error in the branch not used.
 

src/core/file_sys/vfs_real.h

@@ -3,9 +3,8 @@
 
 #pragma once
 
-#include <map>
 #include <string_view>
-#include "common/intrusive_list.h"
+#include <boost/container/flat_map.hpp>
 #include "core/file_sys/mode.h"
 #include "core/file_sys/vfs.h"
 
@@ -15,11 +14,6 @@ class IOFile;
 
 namespace FileSys {
 
-struct FileReference : public Common::IntrusiveListBaseNode<FileReference> {
-    std::shared_ptr<Common::FS::IOFile> file{};
-};
-
-class RealVfsFile;
 class RealVfsFilesystem : public VfsFilesystem {
 public:
     RealVfsFilesystem();
@@ -41,21 +35,7 @@ public:
     bool DeleteDirectory(std::string_view path) override;
 
 private:
-    using ReferenceListType = Common::IntrusiveListBaseTraits<FileReference>::ListType;
-    std::map<std::string, std::weak_ptr<VfsFile>, std::less<>> cache;
-    ReferenceListType open_references;
-    ReferenceListType closed_references;
-    size_t num_open_files{};
-
-private:
-    friend class RealVfsFile;
-    void RefreshReference(const std::string& path, Mode perms, FileReference& reference);
-    void DropReference(std::unique_ptr<FileReference>&& reference);
-    void EvictSingleReference();
-
-private:
-    void InsertReferenceIntoList(FileReference& reference);
-    void RemoveReferenceFromList(FileReference& reference);
+    boost::container::flat_map<std::string, std::weak_ptr<Common::FS::IOFile>> cache;
 };
 
 // An implementation of VfsFile that represents a file on the user's computer.
@@ -77,11 +57,13 @@ public:
     bool Rename(std::string_view name) override;
 
 private:
-    RealVfsFile(RealVfsFilesystem& base, std::unique_ptr<FileReference> reference,
+    RealVfsFile(RealVfsFilesystem& base, std::shared_ptr<Common::FS::IOFile> backing,
                 const std::string& path, Mode perms = Mode::Read);
 
+    void Close();
+
     RealVfsFilesystem& base;
-    std::unique_ptr<FileReference> reference;
+    std::shared_ptr<Common::FS::IOFile> backing;
     std::string path;
     std::string parent_path;
     std::vector<std::string> path_components;

src/core/hle/kernel/k_thread.cpp

@@ -4,8 +4,6 @@
 #include <algorithm>
 #include <atomic>
 #include <cinttypes>
-#include <condition_variable>
-#include <mutex>
 #include <optional>
 #include <vector>
 
@@ -1315,8 +1313,7 @@ void KThread::RequestDummyThreadWait() {
     ASSERT(this->IsDummyThread());
 
     // We will block when the scheduler lock is released.
-    std::scoped_lock lock{m_dummy_thread_mutex};
-    m_dummy_thread_runnable = false;
+    m_dummy_thread_runnable.store(false);
 }
 
 void KThread::DummyThreadBeginWait() {
@@ -1326,8 +1323,7 @@ void KThread::DummyThreadBeginWait() {
     }
 
     // Block until runnable is no longer false.
-    std::unique_lock lock{m_dummy_thread_mutex};
-    m_dummy_thread_cv.wait(lock, [this] { return m_dummy_thread_runnable; });
+    m_dummy_thread_runnable.wait(false);
 }
 
 void KThread::DummyThreadEndWait() {
@@ -1335,11 +1331,8 @@ void KThread::DummyThreadEndWait() {
     ASSERT(this->IsDummyThread());
 
     // Wake up the waiting thread.
-    {
-        std::scoped_lock lock{m_dummy_thread_mutex};
-        m_dummy_thread_runnable = true;
-    }
-    m_dummy_thread_cv.notify_one();
+    m_dummy_thread_runnable.store(true);
+    m_dummy_thread_runnable.notify_one();
 }
 
 void KThread::BeginWait(KThreadQueue* queue) {

src/core/hle/kernel/k_thread.h

@@ -892,9 +892,7 @@ private:
     std::shared_ptr<Common::Fiber> m_host_context{};
     ThreadType m_thread_type{};
     StepState m_step_state{};
-    bool m_dummy_thread_runnable{true};
-    std::mutex m_dummy_thread_mutex{};
-    std::condition_variable m_dummy_thread_cv{};
+    std::atomic<bool> m_dummy_thread_runnable{true};
 
     // For debugging
     std::vector<KSynchronizationObject*> m_wait_objects_for_debugging{};

src/core/hle/service/nfc/common/amiibo_crypto.cpp

@@ -36,12 +36,12 @@ bool IsAmiiboValid(const EncryptedNTAG215File& ntag_file) {
 
     // Validate UUID
     constexpr u8 CT = 0x88; // As defined in `ISO / IEC 14443 - 3`
-    if ((CT ^ ntag_file.uuid.part1[0] ^ ntag_file.uuid.part1[1] ^ ntag_file.uuid.part1[2]) !=
-        ntag_file.uuid.crc_check1) {
+    if ((CT ^ ntag_file.uuid.uid[0] ^ ntag_file.uuid.uid[1] ^ ntag_file.uuid.uid[2]) !=
+        ntag_file.uuid.uid[3]) {
         return false;
     }
-    if ((ntag_file.uuid.part2[0] ^ ntag_file.uuid.part2[1] ^ ntag_file.uuid.part2[2] ^
-         ntag_file.uuid.nintendo_id) != ntag_file.uuid_crc_check2) {
+    if ((ntag_file.uuid.uid[4] ^ ntag_file.uuid.uid[5] ^ ntag_file.uuid.uid[6] ^
+         ntag_file.uuid.nintendo_id) != ntag_file.uuid.lock_bytes[0]) {
         return false;
     }
 
@@ -74,9 +74,8 @@ bool IsAmiiboValid(const NTAG215File& ntag_file) {
 NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data) {
     NTAG215File encoded_data{};
 
-    encoded_data.uid = nfc_data.uuid;
-    encoded_data.uid_crc_check2 = nfc_data.uuid_crc_check2;
-    encoded_data.internal_number = nfc_data.internal_number;
+    encoded_data.uid = nfc_data.uuid.uid;
+    encoded_data.nintendo_id = nfc_data.uuid.nintendo_id;
     encoded_data.static_lock = nfc_data.static_lock;
     encoded_data.compability_container = nfc_data.compability_container;
     encoded_data.hmac_data = nfc_data.user_memory.hmac_data;
@@ -95,6 +94,7 @@ NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data) {
     encoded_data.register_info_crc = nfc_data.user_memory.register_info_crc;
     encoded_data.application_area = nfc_data.user_memory.application_area;
     encoded_data.hmac_tag = nfc_data.user_memory.hmac_tag;
+    encoded_data.lock_bytes = nfc_data.uuid.lock_bytes;
     encoded_data.model_info = nfc_data.user_memory.model_info;
     encoded_data.keygen_salt = nfc_data.user_memory.keygen_salt;
     encoded_data.dynamic_lock = nfc_data.dynamic_lock;
@@ -108,9 +108,9 @@ NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data) {
 EncryptedNTAG215File EncodedDataToNfcData(const NTAG215File& encoded_data) {
     EncryptedNTAG215File nfc_data{};
 
-    nfc_data.uuid = encoded_data.uid;
-    nfc_data.uuid_crc_check2 = encoded_data.uid_crc_check2;
-    nfc_data.internal_number = encoded_data.internal_number;
+    nfc_data.uuid.uid = encoded_data.uid;
+    nfc_data.uuid.nintendo_id = encoded_data.nintendo_id;
+    nfc_data.uuid.lock_bytes = encoded_data.lock_bytes;
     nfc_data.static_lock = encoded_data.static_lock;
     nfc_data.compability_container = encoded_data.compability_container;
     nfc_data.user_memory.hmac_data = encoded_data.hmac_data;
@@ -139,12 +139,23 @@ EncryptedNTAG215File EncodedDataToNfcData(const NTAG215File& encoded_data) {
     return nfc_data;
 }
 
+u32 GetTagPassword(const TagUuid& uuid) {
+    // Verify that the generated password is correct
+    u32 password = 0xAA ^ (uuid.uid[1] ^ uuid.uid[3]);
+    password &= (0x55 ^ (uuid.uid[2] ^ uuid.uid[4])) << 8;
+    password &= (0xAA ^ (uuid.uid[3] ^ uuid.uid[5])) << 16;
+    password &= (0x55 ^ (uuid.uid[4] ^ uuid.uid[6])) << 24;
+    return password;
+}
+
 HashSeed GetSeed(const NTAG215File& data) {
     HashSeed seed{
         .magic = data.write_counter,
         .padding = {},
         .uid_1 = data.uid,
+        .nintendo_id_1 = data.nintendo_id,
         .uid_2 = data.uid,
+        .nintendo_id_2 = data.nintendo_id,
         .keygen_salt = data.keygen_salt,
     };
 
@@ -166,11 +177,10 @@ std::vector<u8> GenerateInternalKey(const InternalKey& key, const HashSeed& seed
     output.insert(output.end(), key.magic_bytes.begin(),
                   key.magic_bytes.begin() + key.magic_length);
 
-    std::array<u8, sizeof(NFP::TagUuid)> seed_uuid{};
-    memcpy(seed_uuid.data(), &seed.uid_1, sizeof(NFP::TagUuid));
-    output.insert(output.end(), seed_uuid.begin(), seed_uuid.end());
-    memcpy(seed_uuid.data(), &seed.uid_2, sizeof(NFP::TagUuid));
-    output.insert(output.end(), seed_uuid.begin(), seed_uuid.end());
+    output.insert(output.end(), seed.uid_1.begin(), seed.uid_1.end());
+    output.emplace_back(seed.nintendo_id_1);
+    output.insert(output.end(), seed.uid_2.begin(), seed.uid_2.end());
+    output.emplace_back(seed.nintendo_id_2);
 
     for (std::size_t i = 0; i < sizeof(seed.keygen_salt); i++) {
         output.emplace_back(static_cast<u8>(seed.keygen_salt[i] ^ key.xor_pad[i]));
@@ -254,8 +264,8 @@ void Cipher(const DerivedKeys& keys, const NTAG215File& in_data, NTAG215File& ou
 
     // Copy the rest of the data directly
     out_data.uid = in_data.uid;
-    out_data.uid_crc_check2 = in_data.uid_crc_check2;
-    out_data.internal_number = in_data.internal_number;
+    out_data.nintendo_id = in_data.nintendo_id;
+    out_data.lock_bytes = in_data.lock_bytes;
     out_data.static_lock = in_data.static_lock;
     out_data.compability_container = in_data.compability_container;
 

src/core/hle/service/nfc/common/amiibo_crypto.h

@@ -24,8 +24,10 @@ using DrgbOutput = std::array<u8, 0x20>;
 struct HashSeed {
     u16_be magic;
     std::array<u8, 0xE> padding;
-    TagUuid uid_1;
-    TagUuid uid_2;
+    NFC::UniqueSerialNumber uid_1;
+    u8 nintendo_id_1;
+    NFC::UniqueSerialNumber uid_2;
+    u8 nintendo_id_2;
     std::array<u8, 0x20> keygen_salt;
 };
 static_assert(sizeof(HashSeed) == 0x40, "HashSeed is an invalid size");
@@ -67,6 +69,9 @@ NTAG215File NfcDataToEncodedData(const EncryptedNTAG215File& nfc_data);
 /// Converts from encoded file format to encrypted file format
 EncryptedNTAG215File EncodedDataToNfcData(const NTAG215File& encoded_data);
 
+/// Returns password needed to allow write access to protected memory
+u32 GetTagPassword(const TagUuid& uuid);
+
 // Generates Seed needed for key derivation
 HashSeed GetSeed(const NTAG215File& data);
 

src/core/hle/service/nfc/common/device.cpp

@@ -242,39 +242,34 @@ Result NfcDevice::GetTagInfo(NFP::TagInfo& tag_info, bool is_mifare) const {
         return ResultWrongDeviceState;
     }
 
-    UniqueSerialNumber uuid{};
-    u8 uuid_length{};
-    NfcProtocol protocol{NfcProtocol::TypeA};
-    TagType tag_type{TagType::Type2};
+    UniqueSerialNumber uuid = encrypted_tag_data.uuid.uid;
+
+    // Generate random UUID to bypass amiibo load limits
+    if (Settings::values.random_amiibo_id) {
+        Common::TinyMT rng{};
+        rng.Initialize(static_cast<u32>(GetCurrentPosixTime()));
+        rng.GenerateRandomBytes(uuid.data(), sizeof(UniqueSerialNumber));
+        uuid[3] = 0x88 ^ uuid[0] ^ uuid[1] ^ uuid[2];
+    }
 
     if (is_mifare) {
-        tag_type = TagType::Mifare;
-        uuid_length = sizeof(NFP::NtagTagUuid);
-        memcpy(uuid.data(), mifare_data.data(), uuid_length);
-    } else {
-        tag_type = TagType::Type2;
-        uuid_length = sizeof(NFP::NtagTagUuid);
-        NFP::NtagTagUuid nUuid{
-            .part1 = encrypted_tag_data.uuid.part1,
-            .part2 = encrypted_tag_data.uuid.part2,
-            .nintendo_id = encrypted_tag_data.uuid.nintendo_id,
+        tag_info = {
+            .uuid = uuid,
+            .uuid_extension = {},
+            .uuid_length = static_cast<u8>(uuid.size()),
+            .protocol = NfcProtocol::TypeA,
+            .tag_type = TagType::Type4,
         };
-        memcpy(uuid.data(), &nUuid, uuid_length);
-
-        // Generate random UUID to bypass amiibo load limits
-        if (Settings::values.random_amiibo_id) {
-            Common::TinyMT rng{};
-            rng.Initialize(static_cast<u32>(GetCurrentPosixTime()));
-            rng.GenerateRandomBytes(uuid.data(), uuid_length);
-        }
+        return ResultSuccess;
     }
 
     // Protocol and tag type may change here
     tag_info = {
         .uuid = uuid,
-        .uuid_length = uuid_length,
-        .protocol = protocol,
-        .tag_type = tag_type,
+        .uuid_extension = {},
+        .uuid_length = static_cast<u8>(uuid.size()),
+        .protocol = NfcProtocol::TypeA,
+        .tag_type = TagType::Type2,
     };
 
     return ResultSuccess;
@@ -282,38 +277,8 @@ Result NfcDevice::GetTagInfo(NFP::TagInfo& tag_info, bool is_mifare) const {
 
 Result NfcDevice::ReadMifare(std::span<const MifareReadBlockParameter> parameters,
                              std::span<MifareReadBlockData> read_block_data) const {
-    if (device_state != DeviceState::TagFound && device_state != DeviceState::TagMounted) {
-        LOG_ERROR(Service_NFC, "Wrong device state {}", device_state);
-        if (device_state == DeviceState::TagRemoved) {
-            return ResultTagRemoved;
-        }
-        return ResultWrongDeviceState;
-    }
-
     Result result = ResultSuccess;
 
-    TagInfo tag_info{};
-    result = GetTagInfo(tag_info, true);
-
-    if (result.IsError()) {
-        return result;
-    }
-
-    if (tag_info.protocol != NfcProtocol::TypeA || tag_info.tag_type != TagType::Mifare) {
-        return ResultInvalidTagType;
-    }
-
-    if (parameters.size() == 0) {
-        return ResultInvalidArgument;
-    }
-
-    const auto unknown = parameters[0].sector_key.unknown;
-    for (std::size_t i = 0; i < parameters.size(); i++) {
-        if (unknown != parameters[i].sector_key.unknown) {
-            return ResultInvalidArgument;
-        }
-    }
-
     for (std::size_t i = 0; i < parameters.size(); i++) {
         result = ReadMifare(parameters[i], read_block_data[i]);
         if (result.IsError()) {
@@ -328,8 +293,17 @@ Result NfcDevice::ReadMifare(const MifareReadBlockParameter& parameter,
                              MifareReadBlockData& read_block_data) const {
     const std::size_t sector_index = parameter.sector_number * sizeof(DataBlock);
     read_block_data.sector_number = parameter.sector_number;
+
+    if (device_state != DeviceState::TagFound && device_state != DeviceState::TagMounted) {
+        LOG_ERROR(Service_NFC, "Wrong device state {}", device_state);
+        if (device_state == DeviceState::TagRemoved) {
+            return ResultTagRemoved;
+        }
+        return ResultWrongDeviceState;
+    }
+
     if (mifare_data.size() < sector_index + sizeof(DataBlock)) {
-        return ResultMifareError288;
+        return Mifare::ResultReadError;
     }
 
     // TODO: Use parameter.sector_key to read encrypted data
@@ -341,28 +315,6 @@ Result NfcDevice::ReadMifare(const MifareReadBlockParameter& parameter,
 Result NfcDevice::WriteMifare(std::span<const MifareWriteBlockParameter> parameters) {
     Result result = ResultSuccess;
 
-    TagInfo tag_info{};
-    result = GetTagInfo(tag_info, true);
-
-    if (result.IsError()) {
-        return result;
-    }
-
-    if (tag_info.protocol != NfcProtocol::TypeA || tag_info.tag_type != TagType::Mifare) {
-        return ResultInvalidTagType;
-    }
-
-    if (parameters.size() == 0) {
-        return ResultInvalidArgument;
-    }
-
-    const auto unknown = parameters[0].sector_key.unknown;
-    for (std::size_t i = 0; i < parameters.size(); i++) {
-        if (unknown != parameters[i].sector_key.unknown) {
-            return ResultInvalidArgument;
-        }
-    }
-
     for (std::size_t i = 0; i < parameters.size(); i++) {
         result = WriteMifare(parameters[i]);
         if (result.IsError()) {
@@ -372,7 +324,7 @@ Result NfcDevice::WriteMifare(std::span<const MifareWriteBlockParameter> paramet
 
     if (!npad_device->WriteNfc(mifare_data)) {
         LOG_ERROR(Service_NFP, "Error writing to file");
-        return ResultMifareError288;
+        return Mifare::ResultReadError;
     }
 
     return result;
@@ -390,7 +342,7 @@ Result NfcDevice::WriteMifare(const MifareWriteBlockParameter& parameter) {
     }
 
     if (mifare_data.size() < sector_index + sizeof(DataBlock)) {
-        return ResultMifareError288;
+        return Mifare::ResultReadError;
     }
 
     // TODO: Use parameter.sector_key to encrypt the data
@@ -414,7 +366,7 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target
 
     if (!NFP::AmiiboCrypto::IsAmiiboValid(encrypted_tag_data)) {
         LOG_ERROR(Service_NFP, "Not an amiibo");
-        return ResultInvalidTagType;
+        return ResultNotAnAmiibo;
     }
 
     // The loaded amiibo is not encrypted
@@ -429,14 +381,14 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target
     }
 
     if (!NFP::AmiiboCrypto::DecodeAmiibo(encrypted_tag_data, tag_data)) {
-        bool has_backup = HasBackup(encrypted_tag_data.uuid).IsSuccess();
+        bool has_backup = HasBackup(encrypted_tag_data.uuid.uid).IsSuccess();
         LOG_ERROR(Service_NFP, "Can't decode amiibo, has_backup= {}", has_backup);
         return has_backup ? ResultCorruptedDataWithBackup : ResultCorruptedData;
     }
 
     std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File));
     memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data));
-    WriteBackupData(encrypted_tag_data.uuid, data);
+    WriteBackupData(encrypted_tag_data.uuid.uid, data);
 
     device_state = DeviceState::TagMounted;
     mount_target = mount_target_;
@@ -540,7 +492,7 @@ Result NfcDevice::FlushWithBreak(NFP::BreakType break_type) {
         }
 
         memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data));
-        WriteBackupData(encrypted_tag_data.uuid, data);
+        WriteBackupData(encrypted_tag_data.uuid.uid, data);
     }
 
     if (!npad_device->WriteNfc(data)) {
@@ -568,7 +520,7 @@ Result NfcDevice::Restore() {
         return result;
     }
 
-    result = ReadBackupData(tag_info.uuid, tag_info.uuid_length, data);
+    result = ReadBackupData(tag_info.uuid, data);
 
     if (result.IsError()) {
         return result;
@@ -596,7 +548,7 @@ Result NfcDevice::Restore() {
     }
 
     if (!NFP::AmiiboCrypto::IsAmiiboValid(temporary_encrypted_tag_data)) {
-        return ResultInvalidTagType;
+        return ResultNotAnAmiibo;
     }
 
     if (!is_plain_amiibo) {
@@ -1242,12 +1194,10 @@ Result NfcDevice::BreakTag(NFP::BreakType break_type) {
     return FlushWithBreak(break_type);
 }
 
-Result NfcDevice::HasBackup(const UniqueSerialNumber& uid, std::size_t uuid_size) const {
-    ASSERT_MSG(uuid_size < sizeof(UniqueSerialNumber), "Invalid UUID size");
+Result NfcDevice::HasBackup(const NFC::UniqueSerialNumber& uid) const {
     constexpr auto backup_dir = "backup";
     const auto yuzu_amiibo_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::AmiiboDir);
-    const auto file_name =
-        fmt::format("{0:02x}.bin", fmt::join(uid.begin(), uid.begin() + uuid_size, ""));
+    const auto file_name = fmt::format("{0:02x}.bin", fmt::join(uid, ""));
 
     if (!Common::FS::Exists(yuzu_amiibo_dir / backup_dir / file_name)) {
         return ResultUnableToAccessBackupFile;
@@ -1256,19 +1206,10 @@ Result NfcDevice::HasBackup(const UniqueSerialNumber& uid, std::size_t uuid_size
     return ResultSuccess;
 }
 
-Result NfcDevice::HasBackup(const NFP::TagUuid& tag_uid) const {
-    UniqueSerialNumber uuid{};
-    memcpy(uuid.data(), &tag_uid, sizeof(NFP::TagUuid));
-    return HasBackup(uuid, sizeof(NFP::TagUuid));
-}
-
-Result NfcDevice::ReadBackupData(const UniqueSerialNumber& uid, std::size_t uuid_size,
-                                 std::span<u8> data) const {
-    ASSERT_MSG(uuid_size < sizeof(UniqueSerialNumber), "Invalid UUID size");
+Result NfcDevice::ReadBackupData(const NFC::UniqueSerialNumber& uid, std::span<u8> data) const {
     constexpr auto backup_dir = "backup";
     const auto yuzu_amiibo_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::AmiiboDir);
-    const auto file_name =
-        fmt::format("{0:02x}.bin", fmt::join(uid.begin(), uid.begin() + uuid_size, ""));
+    const auto file_name = fmt::format("{0:02x}.bin", fmt::join(uid, ""));
 
     const Common::FS::IOFile keys_file{yuzu_amiibo_dir / backup_dir / file_name,
                                        Common::FS::FileAccessMode::Read,
@@ -1287,21 +1228,12 @@ Result NfcDevice::ReadBackupData(const UniqueSerialNumber& uid, std::size_t uuid
     return ResultSuccess;
 }
 
-Result NfcDevice::ReadBackupData(const NFP::TagUuid& tag_uid, std::span<u8> data) const {
-    UniqueSerialNumber uuid{};
-    memcpy(uuid.data(), &tag_uid, sizeof(NFP::TagUuid));
-    return ReadBackupData(uuid, sizeof(NFP::TagUuid), data);
-}
-
-Result NfcDevice::WriteBackupData(const UniqueSerialNumber& uid, std::size_t uuid_size,
-                                  std::span<const u8> data) {
-    ASSERT_MSG(uuid_size < sizeof(UniqueSerialNumber), "Invalid UUID size");
+Result NfcDevice::WriteBackupData(const NFC::UniqueSerialNumber& uid, std::span<const u8> data) {
     constexpr auto backup_dir = "backup";
     const auto yuzu_amiibo_dir = Common::FS::GetYuzuPath(Common::FS::YuzuPath::AmiiboDir);
-    const auto file_name =
-        fmt::format("{0:02x}.bin", fmt::join(uid.begin(), uid.begin() + uuid_size, ""));
+    const auto file_name = fmt::format("{0:02x}.bin", fmt::join(uid, ""));
 
-    if (HasBackup(uid, uuid_size).IsError()) {
+    if (HasBackup(uid).IsError()) {
         if (!Common::FS::CreateDir(yuzu_amiibo_dir / backup_dir)) {
             return ResultBackupPathAlreadyExist;
         }
@@ -1328,12 +1260,6 @@ Result NfcDevice::WriteBackupData(const UniqueSerialNumber& uid, std::size_t uui
     return ResultSuccess;
 }
 
-Result NfcDevice::WriteBackupData(const NFP::TagUuid& tag_uid, std::span<const u8> data) {
-    UniqueSerialNumber uuid{};
-    memcpy(uuid.data(), &tag_uid, sizeof(NFP::TagUuid));
-    return WriteBackupData(uuid, sizeof(NFP::TagUuid), data);
-}
-
 Result NfcDevice::WriteNtf(std::span<const u8> data) {
     if (device_state != DeviceState::TagMounted) {
         LOG_ERROR(Service_NFC, "Wrong device state {}", device_state);

src/core/hle/service/nfc/common/device.h

@@ -86,14 +86,9 @@ public:
     Result GetAll(NFP::NfpData& data) const;
     Result SetAll(const NFP::NfpData& data);
     Result BreakTag(NFP::BreakType break_type);
-    Result HasBackup(const UniqueSerialNumber& uid, std::size_t uuid_size) const;
-    Result HasBackup(const NFP::TagUuid& tag_uid) const;
-    Result ReadBackupData(const UniqueSerialNumber& uid, std::size_t uuid_size,
-                          std::span<u8> data) const;
-    Result ReadBackupData(const NFP::TagUuid& tag_uid, std::span<u8> data) const;
-    Result WriteBackupData(const UniqueSerialNumber& uid, std::size_t uuid_size,
-                           std::span<const u8> data);
-    Result WriteBackupData(const NFP::TagUuid& tag_uid, std::span<const u8> data);
+    Result HasBackup(const NFC::UniqueSerialNumber& uid) const;
+    Result ReadBackupData(const NFC::UniqueSerialNumber& uid, std::span<u8> data) const;
+    Result WriteBackupData(const NFC::UniqueSerialNumber& uid, std::span<const u8> data);
     Result WriteNtf(std::span<const u8> data);
 
     u64 GetHandle() const;

src/core/hle/service/nfc/common/device_manager.cpp

@@ -550,7 +550,7 @@ Result DeviceManager::ReadBackupData(u64 device_handle, std::span<u8> data) cons
     }
 
     if (result.IsSuccess()) {
-        result = device->ReadBackupData(tag_info.uuid, tag_info.uuid_length, data);
+        result = device->ReadBackupData(tag_info.uuid, data);
         result = VerifyDeviceResult(device, result);
     }
 
@@ -569,7 +569,7 @@ Result DeviceManager::WriteBackupData(u64 device_handle, std::span<const u8> dat
     }
 
     if (result.IsSuccess()) {
-        result = device->WriteBackupData(tag_info.uuid, tag_info.uuid_length, data);
+        result = device->WriteBackupData(tag_info.uuid, data);
         result = VerifyDeviceResult(device, result);
     }
 

src/core/hle/service/nfc/mifare_result.h

@@ -12,6 +12,6 @@ constexpr Result ResultInvalidArgument(ErrorModule::NFCMifare, 65);
 constexpr Result ResultWrongDeviceState(ErrorModule::NFCMifare, 73);
 constexpr Result ResultNfcDisabled(ErrorModule::NFCMifare, 80);
 constexpr Result ResultTagRemoved(ErrorModule::NFCMifare, 97);
-constexpr Result ResultNotAMifare(ErrorModule::NFCMifare, 288);
+constexpr Result ResultReadError(ErrorModule::NFCMifare, 288);
 
 } // namespace Service::NFC::Mifare

src/core/hle/service/nfc/nfc_interface.cpp

@@ -142,13 +142,9 @@ void NfcInterface::AttachAvailabilityChangeEvent(HLERequestContext& ctx) {
 void NfcInterface::StartDetection(HLERequestContext& ctx) {
     IPC::RequestParser rp{ctx};
     const auto device_handle{rp.Pop<u64>()};
-    auto tag_protocol{NfcProtocol::All};
-
-    if (backend_type == BackendType::Nfc) {
-        tag_protocol = rp.PopEnum<NfcProtocol>();
-    }
-
+    const auto tag_protocol{rp.PopEnum<NfcProtocol>()};
     LOG_INFO(Service_NFC, "called, device_handle={}, nfp_protocol={}", device_handle, tag_protocol);
+
     auto result = GetManager()->StartDetection(device_handle, tag_protocol);
     result = TranslateResultToServiceError(result);
 
@@ -359,7 +355,7 @@ Result NfcInterface::TranslateResultToNfp(Result result) const {
     if (result == ResultApplicationAreaExist) {
         return NFP::ResultApplicationAreaExist;
     }
-    if (result == ResultInvalidTagType) {
+    if (result == ResultNotAnAmiibo) {
         return NFP::ResultNotAnAmiibo;
     }
     if (result == ResultUnableToAccessBackupFile) {
@@ -385,9 +381,6 @@ Result NfcInterface::TranslateResultToMifare(Result result) const {
     if (result == ResultTagRemoved) {
         return Mifare::ResultTagRemoved;
     }
-    if (result == ResultInvalidTagType) {
-        return Mifare::ResultNotAMifare;
-    }
     LOG_WARNING(Service_NFC, "Result conversion not handled");
     return result;
 }

src/core/hle/service/nfc/nfc_result.h

@@ -24,8 +24,7 @@ constexpr Result ResultCorruptedDataWithBackup(ErrorModule::NFC, 136);
 constexpr Result ResultCorruptedData(ErrorModule::NFC, 144);
 constexpr Result ResultWrongApplicationAreaId(ErrorModule::NFC, 152);
 constexpr Result ResultApplicationAreaExist(ErrorModule::NFC, 168);
-constexpr Result ResultInvalidTagType(ErrorModule::NFC, 178);
+constexpr Result ResultNotAnAmiibo(ErrorModule::NFC, 178);
 constexpr Result ResultBackupPathAlreadyExist(ErrorModule::NFC, 216);
-constexpr Result ResultMifareError288(ErrorModule::NFC, 288);
 
 } // namespace Service::NFC

src/core/hle/service/nfc/nfc_types.h

@@ -35,35 +35,32 @@ enum class State : u32 {
 
 // This is nn::nfc::TagType
 enum class TagType : u32 {
-    None = 0,
-    Type1 = 1U << 0,  // ISO14443A RW. Topaz
-    Type2 = 1U << 1,  // ISO14443A RW. Ultralight, NTAGX, ST25TN
-    Type3 = 1U << 2,  // ISO14443A RW/RO. Sony FeliCa
-    Type4A = 1U << 3, // ISO14443A RW/RO. DESFire
-    Type4B = 1U << 4, // ISO14443B RW/RO. DESFire
-    Type5 = 1U << 5,  // ISO15693 RW/RO. SLI, SLIX, ST25TV
-    Mifare = 1U << 6, // Mifare classic. Skylanders
-    All = 0xFFFFFFFF,
+    None,
+    Type1, // ISO14443A RW 96-2k bytes 106kbit/s
+    Type2, // ISO14443A RW/RO 540 bytes 106kbit/s
+    Type3, // Sony FeliCa RW/RO 2k bytes 212kbit/s
+    Type4, // ISO14443A RW/RO 4k-32k bytes 424kbit/s
+    Type5, // ISO15693 RW/RO 540 bytes 106kbit/s
 };
 
 enum class PackedTagType : u8 {
-    None = 0,
-    Type1 = 1U << 0,  // ISO14443A RW. Topaz
-    Type2 = 1U << 1,  // ISO14443A RW. Ultralight, NTAGX, ST25TN
-    Type3 = 1U << 2,  // ISO14443A RW/RO. Sony FeliCa
-    Type4A = 1U << 3, // ISO14443A RW/RO. DESFire
-    Type4B = 1U << 4, // ISO14443B RW/RO. DESFire
-    Type5 = 1U << 5,  // ISO15693 RW/RO. SLI, SLIX, ST25TV
-    Mifare = 1U << 6, // Mifare classic. Skylanders
-    All = 0xFF,
+    None,
+    Type1, // ISO14443A RW 96-2k bytes 106kbit/s
+    Type2, // ISO14443A RW/RO 540 bytes 106kbit/s
+    Type3, // Sony FeliCa RW/RO 2k bytes 212kbit/s
+    Type4, // ISO14443A RW/RO 4k-32k bytes 424kbit/s
+    Type5, // ISO15693 RW/RO 540 bytes 106kbit/s
 };
 
 // This is nn::nfc::NfcProtocol
+// Verify this enum. It might be completely wrong default protocol is 0x48
 enum class NfcProtocol : u32 {
     None,
     TypeA = 1U << 0, // ISO14443A
     TypeB = 1U << 1, // ISO14443B
     TypeF = 1U << 2, // Sony FeliCa
+    Unknown1 = 1U << 3,
+    Unknown2 = 1U << 5,
     All = 0xFFFFFFFFU,
 };
 
@@ -72,7 +69,8 @@ enum class TestWaveType : u32 {
     Unknown,
 };
 
-using UniqueSerialNumber = std::array<u8, 10>;
+using UniqueSerialNumber = std::array<u8, 7>;
+using UniqueSerialNumberExtension = std::array<u8, 3>;
 
 // This is nn::nfc::DeviceHandle
 using DeviceHandle = u64;
@@ -80,6 +78,7 @@ using DeviceHandle = u64;
 // This is nn::nfc::TagInfo
 struct TagInfo {
     UniqueSerialNumber uuid;
+    UniqueSerialNumberExtension uuid_extension;
     u8 uuid_length;
     INSERT_PADDING_BYTES(0x15);
     NfcProtocol protocol;