From e363d24b1c9444a7b6688a04b1a8200c9e0a5094 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 8 Jun 2022 20:04:12 -0500 Subject: [PATCH] Add PiP title and subtilte on Android 13 --- app/src/main/java/com/limelight/Game.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/limelight/Game.java b/app/src/main/java/com/limelight/Game.java index 4ee27c87..6c0d51b1 100644 --- a/app/src/main/java/com/limelight/Game.java +++ b/app/src/main/java/com/limelight/Game.java @@ -120,6 +120,8 @@ public class Game extends Activity implements SurfaceHolder.Callback, private boolean autoEnterPip = false; private boolean surfaceCreated = false; private boolean attemptedConnection = false; + private String pcName; + private String appName; private InputCaptureProvider inputCaptureProvider; private int modifierFlags = 0; @@ -269,12 +271,13 @@ public class Game extends Activity implements SurfaceHolder.Callback, lowLatencyWifiLock.acquire(); } + appName = Game.this.getIntent().getStringExtra(EXTRA_APP_NAME); + pcName = Game.this.getIntent().getStringExtra(EXTRA_PC_NAME); + String host = Game.this.getIntent().getStringExtra(EXTRA_HOST); - String appName = Game.this.getIntent().getStringExtra(EXTRA_APP_NAME); int appId = Game.this.getIntent().getIntExtra(EXTRA_APP_ID, StreamConfiguration.INVALID_APP_ID); String uniqueId = Game.this.getIntent().getStringExtra(EXTRA_UNIQUEID); String uuid = Game.this.getIntent().getStringExtra(EXTRA_PC_UUID); - String pcName = Game.this.getIntent().getStringExtra(EXTRA_PC_NAME); boolean appSupportsHdr = Game.this.getIntent().getBooleanExtra(EXTRA_APP_HDR, false); byte[] derCertData = Game.this.getIntent().getByteArrayExtra(EXTRA_SERVER_CERT); @@ -546,6 +549,18 @@ public class Game extends Activity implements SurfaceHolder.Callback, builder.setSeamlessResizeEnabled(true); } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { + if (appName != null) { + builder.setTitle(appName); + if (pcName != null) { + builder.setSubtitle(pcName); + } + } + else if (pcName != null) { + builder.setTitle(pcName); + } + } + return builder.build(); }