VERY experimental Nintendo Switch 2 emulator
C++
android: Don't enter PiP during startup or shutdown
t895a1e302cc69c2
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 054e4b7558..f41d7bdbfa 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@@ -373,8 +373,10 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {val pictureInPictureParamsBuilder = PictureInPictureParams.Builder().getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {+ val isEmulationActive = emulationViewModel.emulationStarted.value &&+ !emulationViewModel.isEmulationStopping.valuepictureInPictureParamsBuilder.setAutoEnterEnabled(- BooleanSetting.PICTURE_IN_PICTURE.boolean+ BooleanSetting.PICTURE_IN_PICTURE.boolean && isEmulationActive)}setPictureInPictureParams(pictureInPictureParamsBuilder.build())