From f8ef386065b6f12fea99ee01367badc27c55539f Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Tue, 23 May 2023 11:34:37 +0100
Subject: [PATCH] Use artwork display mode in demo app

- Use artwork display mode `fill` to improve visual apperance
- Some minor cleanup

#minor-release

PiperOrigin-RevId: 534366246
(cherry picked from commit 230921e4ab999f3f9af40688cedaf02631052a95)
---
 .../androidx/media3/demo/session/PlayableFolderActivity.kt     | 3 +--
 .../main/java/androidx/media3/demo/session/PlaybackService.kt  | 2 --
 .../main/java/androidx/media3/demo/session/PlayerActivity.kt   | 2 +-
 demos/session/src/main/res/layout/activity_player.xml          | 1 +
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt
index f0dbec48fc..f9c6873e80 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt
@@ -88,8 +88,7 @@ class PlayableFolderActivity : AppCompatActivity() {
       browser.shuffleModeEnabled = true
       browser.prepare()
       browser.play()
-      val intent = Intent(this, PlayerActivity::class.java)
-      startActivity(intent)
+      browser?.sessionActivity?.send()
     }
 
     findViewById<Button>(R.id.play_button).setOnClickListener {
diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt
index 26d396a7d6..0a281e7b46 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/PlaybackService.kt
@@ -298,8 +298,6 @@ class PlaybackService : MediaLibraryService() {
       val pendingIntent =
         TaskStackBuilder.create(this@PlaybackService).run {
           addNextIntent(Intent(this@PlaybackService, MainActivity::class.java))
-
-          val immutableFlag = if (Build.VERSION.SDK_INT >= 23) FLAG_IMMUTABLE else 0
           getPendingIntent(0, immutableFlag or FLAG_UPDATE_CURRENT)
         }
       val builder =
diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
index b769bd3967..b1cd0e7d9d 100644
--- a/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
+++ b/demos/session/src/main/java/androidx/media3/demo/session/PlayerActivity.kt
@@ -122,7 +122,7 @@ class PlayerActivity : AppCompatActivity() {
   }
 
   private fun updateMediaMetadataUI(mediaMetadata: MediaMetadata) {
-    val title: CharSequence = mediaMetadata.title ?: "getString(R.string.no_item_prompt)"
+    val title: CharSequence = mediaMetadata.title ?: ""
 
     findViewById<TextView>(R.id.media_title).text = title
     findViewById<TextView>(R.id.media_artist).text = mediaMetadata.artist
diff --git a/demos/session/src/main/res/layout/activity_player.xml b/demos/session/src/main/res/layout/activity_player.xml
index 7497477720..a638d8aca6 100644
--- a/demos/session/src/main/res/layout/activity_player.xml
+++ b/demos/session/src/main/res/layout/activity_player.xml
@@ -31,6 +31,7 @@
       android:background="@color/player_background"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
+      app:artwork_display_mode="fill"
       app:default_artwork="@drawable/artwork_placeholder"
       app:repeat_toggle_modes="one|all"
       app:show_shuffle_button="true"