VERY experimental Nintendo Switch 2 emulator
C++
android: Add Picture in Picture / Orientation
Abandoned Cart399fb7489054
diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xmlindex b474ddb0bd..e31ad69e20 100644--- a/src/android/app/src/main/AndroidManifest.xml+++ b/src/android/app/src/main/AndroidManifest.xml@@ -54,6 +54,8 @@ SPDX-License-Identifier: GPL-3.0-or-laterandroid:name="org.yuzu.yuzu_emu.activities.EmulationActivity"android:theme="@style/Theme.Yuzu.Main"android:screenOrientation="userLandscape"+ android:supportsPictureInPicture="true"+ android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|uiMode"android:exported="true"><intent-filter>diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.ktindex caf6603487..e2eab31055 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt@@ -4,14 +4,23 @@package org.yuzu.yuzu_emu.activitiesimport android.app.Activity+import android.app.PendingIntent+import android.app.PictureInPictureParams+import android.app.RemoteAction+import android.content.BroadcastReceiverimport android.content.Contextimport android.content.Intent+import android.content.IntentFilter+import android.content.res.Configurationimport android.graphics.Rect+import android.graphics.drawable.Iconimport android.hardware.Sensorimport android.hardware.SensorEventimport android.hardware.SensorEventListenerimport android.hardware.SensorManager+import android.os.Buildimport android.os.Bundle+import android.util.Rationalimport android.view.InputDeviceimport android.view.KeyEventimport android.view.MotionEvent@@ -27,6 +36,8 @@ import androidx.navigation.fragment.NavHostFragmentimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.Rimport org.yuzu.yuzu_emu.databinding.ActivityEmulationBinding+import org.yuzu.yuzu_emu.features.settings.model.BooleanSetting+import org.yuzu.yuzu_emu.features.settings.model.IntSettingimport org.yuzu.yuzu_emu.features.settings.model.SettingsViewModelimport org.yuzu.yuzu_emu.model.Gameimport org.yuzu.yuzu_emu.utils.ControllerMappingHelper@@ -50,6 +61,9 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {private var motionTimestamp: Long = 0private var flipMotionOrientation: Boolean = false+ private val actionPause = "ACTION_EMULATOR_PAUSE"+ private val actionPlay = "ACTION_EMULATOR_PLAY"+private val settingsViewModel: SettingsViewModel by viewModels()override fun onDestroy() {@@ -120,6 +134,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {super.onResume()nfcReader.startScanning()startMotionSensorListener()++ buildPictureInPictureParams()}override fun onPause() {@@ -128,6 +144,16 @@ 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)@@ -230,6 +256,79 @@ 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+ }+ 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++ val isEmulationPaused = emulationFragment?.isEmulationStatePaused() ?: false+ if (isEmulationPaused) {+ val playIcon = Icon.createWithResource(this@EmulationActivity, R.drawable.ic_pip_play)+ val playPendingIntent = PendingIntent.getBroadcast(+ this@EmulationActivity, R.drawable.ic_pip_play, Intent(actionPlay), pendingFlags+ )+ val playRemoteAction = RemoteAction(playIcon, getString(R.string.play), getString(R.string.play), playPendingIntent)+ 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) {+ emulationFragment?.onPictureInPicturePlay()+ } else if (intent.action == actionPause) {+ emulationFragment?.onPictureInPicturePause()+ }+ buildPictureInPictureParams()+ }+ }++ override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {+ super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)+ if (isInPictureInPictureMode) {+ IntentFilter().apply {+ addAction(actionPause)+ addAction(actionPlay)+ }.also {+ registerReceiver(pictureInPictureReceiver, it)+ }+ emulationFragment?.onPictureInPictureEnter()+ } else {+ try {+ unregisterReceiver(pictureInPictureReceiver)+ } catch (ignored : Exception) { }+ emulationFragment?.onPictureInPictureLeave()+ }+ }+private fun startMotionSensorListener() {val sensorManager = this.getSystemService(Context.SENSOR_SERVICE) as SensorManagerval gyroSensor = sensorManager.getDefaultSensor(Sensor.TYPE_GYROSCOPE)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.ktindex 3dfd66779d..63b4df2733 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt@@ -8,6 +8,7 @@ enum class BooleanSetting(override val section: String,override val defaultValue: Boolean) : AbstractBooleanSetting {+ 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@@ -27,6 +28,7 @@ enum class BooleanSetting(companion object {private val NOT_RUNTIME_EDITABLE = listOf(+ PICTURE_IN_PICTURE,USE_CUSTOM_RTC)diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.ktindex fa84f94f5e..4427a7d9dc 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt@@ -93,6 +93,11 @@ 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,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.ktindex 8df20b928f..4f753955b8 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt@@ -133,7 +133,6 @@ 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"@@ -144,6 +143,14 @@ class Settings {private val configFileSectionsMap: MutableMap<String, List<String>> = HashMap()+ // 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+init {configFileSectionsMap[SettingsFile.FILE_NAME_CONFIG] =listOf(diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.ktindex 72e2cce2ac..3853845ce7 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt@@ -16,6 +16,7 @@ import androidx.core.view.WindowCompatimport androidx.core.view.WindowInsetsCompatimport android.view.ViewGroup.MarginLayoutParamsimport androidx.activity.OnBackPressedCallback+import androidx.activity.result.ActivityResultLauncherimport androidx.core.view.updatePaddingimport com.google.android.material.color.MaterialColorsimport org.yuzu.yuzu_emu.NativeLibrary@@ -239,5 +240,12 @@ 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)+ }}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.ktindex 1ceaa6fb4a..b611389a15 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt@@ -166,6 +166,15 @@ 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+ )+ )}}@@ -283,6 +292,17 @@ 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,diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.ktindex 02bfcdb1eb..6ea5c90f32 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt@@ -7,6 +7,7 @@ import android.annotation.SuppressLintimport android.app.AlertDialogimport android.content.Contextimport android.content.DialogInterface+import android.content.Intentimport android.content.SharedPreferencesimport android.content.pm.ActivityInfoimport android.content.res.Resources@@ -19,11 +20,14 @@ import android.util.TypedValueimport android.view.*import android.widget.TextViewimport androidx.activity.OnBackPressedCallback+import androidx.activity.result.ActivityResultLauncher+import androidx.activity.result.contract.ActivityResultContractsimport androidx.appcompat.widget.PopupMenuimport androidx.core.content.res.ResourcesCompatimport androidx.core.graphics.Insetsimport androidx.core.view.ViewCompatimport androidx.core.view.WindowInsetsCompat+import androidx.core.view.isVisibleimport androidx.core.view.updatePaddingimport androidx.fragment.app.Fragmentimport androidx.lifecycle.Lifecycle@@ -61,11 +65,30 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {val args by navArgs<EmulationFragmentArgs>()+ private lateinit var onReturnFromSettings: ActivityResultLauncher<Intent>+override fun onAttach(context: Context) {super.onAttach(context)if (context is EmulationActivity) {emulationActivity = contextNativeLibrary.setEmulationActivity(context)++ onReturnFromSettings = context.activityResultRegistry.register(+ "SettingsResult", ActivityResultContracts.StartActivityForResult()+ ) {+ 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()+ updateScreenLayout()+ }} else {throw IllegalStateException("EmulationFragment must have EmulationActivity parent")}@@ -129,7 +152,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {}R.id.menu_settings -> {- SettingsActivity.launch(requireContext(), SettingsFile.FILE_NAME_CONFIG, "")+ SettingsActivity.launch(+ requireContext(), onReturnFromSettings, SettingsFile.FILE_NAME_CONFIG, ""+ )true}@@ -162,7 +187,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {WindowInfoTracker.getOrCreate(requireContext()).windowLayoutInfo(requireActivity())- .collect { updateCurrentLayout(requireActivity() as EmulationActivity, it) }+ .collect { updateFoldableLayout(requireActivity() as EmulationActivity, it) }}}}@@ -204,6 +229,37 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {super.onDetach()}+ fun isEmulationStatePaused() : Boolean {+ return this::emulationState.isInitialized && emulationState.isPaused+ }++ fun onPictureInPictureEnter() {+ if (binding.drawerLayout.isOpen) {+ binding.drawerLayout.close()+ }+ if (EmulationMenuSettings.showOverlay) {+ binding.surfaceInputOverlay.post { binding.surfaceInputOverlay.isVisible = false }+ }+ }++ fun onPictureInPicturePause() {+ if (!emulationState.isPaused) {+ emulationState.pause()+ }+ }++ fun onPictureInPicturePlay() {+ if (emulationState.isPaused) {+ emulationState.run(false)+ }+ }++ fun onPictureInPictureLeave() {+ if (EmulationMenuSettings.showOverlay) {+ binding.surfaceInputOverlay.post { binding.surfaceInputOverlay.isVisible = true }+ }+ }+private fun refreshInputOverlay() {binding.surfaceInputOverlay.refreshControls()}@@ -243,15 +299,33 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {}}+ @SuppressLint("SourceLockedOrientationActivity")+ private fun updateScreenLayout() {+ emulationActivity?.let {+ when (IntSetting.RENDERER_SCREEN_LAYOUT.int) {+ Settings.LayoutOption_MobileLandscape -> {+ it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE+ }+ Settings.LayoutOption_MobilePortrait -> {+ it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT+ }+ Settings.LayoutOption_Default -> {+ it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED+ }+ else -> { it.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE }+ }+ }+ }+private val Number.toPx get() = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, this.toFloat(), Resources.getSystem().displayMetrics).toInt()- fun updateCurrentLayout(emulationActivity: EmulationActivity, newLayoutInfo: WindowLayoutInfo) {+ 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_UNSPECIFIEDif (it.orientation == FoldingFeature.Orientation.HORIZONTAL) {- binding.surfaceEmulation.layoutParams.height = it.bounds.top- binding.inGameMenu.layoutParams.height = it.bounds.bottom+ binding.emulationContainer.layoutParams.height = it.bounds.top+ // Prevent touch regions from being displayed in the hingebinding.overlayContainer.layoutParams.height = it.bounds.bottom - 48.toPxbinding.overlayContainer.updatePadding(0, 0, 0, 24.toPx)}@@ -259,14 +333,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {it.isSeparating} ?: falseif (!isFolding) {- binding.surfaceEmulation.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT- binding.inGameMenu.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT+ binding.emulationContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENTbinding.overlayContainer.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENTbinding.overlayContainer.updatePadding(0, 0, 0, 0)- emulationActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE+ updateScreenLayout()}- binding.surfaceInputOverlay.requestLayout()- binding.inGameMenu.requestLayout()+ binding.emulationContainer.requestLayout()binding.overlayContainer.requestLayout()}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.ktindex aa424c768e..724929a040 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt@@ -3,6 +3,7 @@package org.yuzu.yuzu_emu.overlay+import android.annotation.SuppressLintimport android.app.Activityimport android.content.Contextimport android.content.SharedPreferences@@ -15,12 +16,14 @@ import android.graphics.drawable.Drawableimport android.graphics.drawable.VectorDrawableimport android.os.Buildimport android.util.AttributeSet+import android.util.Rationalimport android.view.HapticFeedbackConstantsimport android.view.MotionEventimport android.view.SurfaceViewimport android.view.Viewimport android.view.View.OnTouchListenerimport android.view.WindowInsets+import android.view.WindowManagerimport androidx.core.content.ContextCompatimport androidx.preference.PreferenceManagerimport androidx.window.layout.WindowMetricsCalculator@@ -33,6 +36,7 @@ import org.yuzu.yuzu_emu.features.settings.model.Settingsimport org.yuzu.yuzu_emu.utils.EmulationMenuSettingsimport kotlin.math.maximport kotlin.math.min+import kotlin.math.roundToInt/*** Draws the interactive input overlay on top of the@@ -73,6 +77,25 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(contextrequestFocus()}+ @SuppressLint("DrawAllocation")+ override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {+ super.onMeasure(widthMeasureSpec, heightMeasureSpec)+ val width = MeasureSpec.getSize(widthMeasureSpec)+ val height = MeasureSpec.getSize(heightMeasureSpec)+ if (height > width) {+ val aspectRatio = with (context.getSystemService(Context.WINDOW_SERVICE) as WindowManager) {+ val metrics = maximumWindowMetrics.bounds+ Rational(metrics.height(), metrics.width()).toFloat()+ }+ val newWidth: Int = width+ val newHeight: Int = (width / aspectRatio).roundToInt()+ setMeasuredDimension(newWidth, newHeight)+ invalidate()+ } else {+ setMeasuredDimension(width, height)+ }+ }+override fun draw(canvas: Canvas) {super.draw(canvas)for (button in overlayButtons) {@@ -754,9 +777,8 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context*/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 = 0diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.ktindex e1e7a59d7c..7e8f058c14 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/EmulationMenuSettings.kt@@ -11,14 +11,6 @@ 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: Booleanget() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_JOYSTICK_REL_CENTER, true)set(value) {@@ -41,16 +33,6 @@ 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: Booleanget() = preferences.getBoolean(Settings.PREF_MENU_SETTINGS_SHOW_FPS, false)set(value) {diff --git a/src/android/app/src/main/res/drawable/ic_pip_pause.xml b/src/android/app/src/main/res/drawable/ic_pip_pause.xmlnew file mode 100644index 0000000000..4a7d4ea03d--- /dev/null+++ b/src/android/app/src/main/res/drawable/ic_pip_pause.xml@@ -0,0 +1,9 @@+<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>diff --git a/src/android/app/src/main/res/drawable/ic_pip_play.xml b/src/android/app/src/main/res/drawable/ic_pip_play.xmlnew file mode 100644index 0000000000..2303a4623f--- /dev/null+++ b/src/android/app/src/main/res/drawable/ic_pip_play.xml@@ -0,0 +1,9 @@+<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>diff --git a/src/android/app/src/main/res/layout/fragment_emulation.xml b/src/android/app/src/main/res/layout/fragment_emulation.xmlindex 09b789b6b0..ccd0f4c50b 100644--- a/src/android/app/src/main/res/layout/fragment_emulation.xml+++ b/src/android/app/src/main/res/layout/fragment_emulation.xml@@ -12,14 +12,21 @@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"+ <FrameLayout+ android:id="@+id/emulation_container"android:layout_width="match_parent"- android:layout_height="match_parent"- android:layout_gravity="center"- android:focusable="false"- android:focusableInTouchMode="false" />+ 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><FrameLayoutandroid:id="@+id/overlay_container"@@ -27,34 +34,36 @@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:focusable="true"- android:focusableInTouchMode="true" />+ <!-- 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="bottom"+ 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" />- <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" />- <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>@@ -63,7 +72,7 @@android:id="@+id/in_game_menu"android:layout_width="wrap_content"android:layout_height="match_parent"- android:layout_gravity="start|bottom"+ android:layout_gravity="start"app:headerLayout="@layout/header_in_game"app:menu="@menu/menu_in_game" />diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xmlindex ea20cb17c3..7f7b1938c3 100644--- a/src/android/app/src/main/res/values/arrays.xml+++ b/src/android/app/src/main/res/values/arrays.xml@@ -119,6 +119,18 @@<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>diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex c236811fad..b5bc249d49 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -162,6 +162,7 @@<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>@@ -326,6 +327,11 @@<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>@@ -364,6 +370,12 @@<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>