Browse Source
Merge pull request #12035 from t895/pip-startup-shutdown-fix
android: Don't enter PiP during startup or shutdown
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
1 deletions
-
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.value |
|
|
|
pictureInPictureParamsBuilder.setAutoEnterEnabled( |
|
|
|
BooleanSetting.PICTURE_IN_PICTURE.boolean |
|
|
|
BooleanSetting.PICTURE_IN_PICTURE.boolean && isEmulationActive |
|
|
|
) |
|
|
|
} |
|
|
|
setPictureInPictureParams(pictureInPictureParamsBuilder.build()) |
|
|
|
|