1 files changed, 31 insertions, 11 deletions

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.kt
index 36cc27a05..5ca519f0a 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
@@ -256,34 +256,50 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         }
     }
 
-    private fun PictureInPictureParams.Builder.getPictureInPictureAspectBuilder() : PictureInPictureParams.Builder {
+    private fun PictureInPictureParams.Builder.getPictureInPictureAspectBuilder(): PictureInPictureParams.Builder {
         val aspectRatio = when (IntSetting.RENDERER_ASPECT_RATIO.int) {
             0 -> Rational(16, 9)
             1 -> Rational(4, 3)
             2 -> Rational(21, 9)
             3 -> Rational(16, 10)
-            else -> null
+            else -> null // Best fit
         }
         return this.apply { aspectRatio?.let { setAspectRatio(it) } }
     }
 
-    private fun PictureInPictureParams.Builder.getPictureInPictureActionsBuilder() : PictureInPictureParams.Builder {
-        val pictureInPictureActions : MutableList<RemoteAction> = mutableListOf()
+    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
+                this@EmulationActivity,
+                R.drawable.ic_pip_play,
+                Intent(actionPlay),
+                pendingFlags
+            )
+            val playRemoteAction = RemoteAction(
+                playIcon,
+                getString(R.string.play),
+                getString(R.string.play),
+                playPendingIntent
             )
-            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
+                this@EmulationActivity,
+                R.drawable.ic_pip_pause,
+                Intent(actionPause),
+                pendingFlags
+            )
+            val pauseRemoteAction = RemoteAction(
+                pauseIcon,
+                getString(R.string.pause),
+                getString(R.string.pause),
+                pausePendingIntent
             )
-            val pauseRemoteAction = RemoteAction(pauseIcon, getString(R.string.pause), getString(R.string.pause), pausePendingIntent)
             pictureInPictureActions.add(pauseRemoteAction)
         }
 
@@ -300,7 +316,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
     }
 
     private var pictureInPictureReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context : Context?, intent : Intent) {
+        override fun onReceive(context: Context?, intent: Intent) {
             if (intent.action == actionPlay) {
                 if (NativeLibrary.isPaused()) NativeLibrary.unPauseEmulation()
             } else if (intent.action == actionPause) {
@@ -310,7 +326,10 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         }
     }
 
-    override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
+    override fun onPictureInPictureModeChanged(
+        isInPictureInPictureMode: Boolean,
+        newConfig: Configuration
+    ) {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         if (isInPictureInPictureMode) {
             IntentFilter().apply {
@@ -322,7 +341,8 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
         } else {
             try {
                 unregisterReceiver(pictureInPictureReceiver)
-            } catch (ignored : Exception) { }
+            } catch (ignored : Exception) {
+            }
         }
     }