From d102b932fe218f59ae5ebd290cba9c815dc10e74 Mon Sep 17 00:00:00 2001 From: Ian Baker Date: Wed, 24 Mar 2021 18:07:35 +0000 Subject: [PATCH] Merge pull request #8749 from romanofranz:patch-1 PiperOrigin-RevId: 364779790 --- .../google/android/exoplayer2/demo/IntentUtil.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java index d1cb0357187..b285374e163 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java @@ -23,6 +23,7 @@ import androidx.annotation.Nullable; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.MediaItem; +import com.google.android.exoplayer2.MediaMetadata; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; import com.google.common.collect.ImmutableList; @@ -42,12 +43,12 @@ public class IntentUtil { "com.google.android.exoplayer.demo.action.VIEW_LIST"; // Activity extras. - public static final String PREFER_EXTENSION_DECODERS_EXTRA = "prefer_extension_decoders"; // Media item configuration extras. public static final String URI_EXTRA = "uri"; + public static final String TITLE_EXTRA = "title"; public static final String MIME_TYPE_EXTRA = "mime_type"; public static final String CLIP_START_POSITION_MS_EXTRA = "clip_start_position_ms"; public static final String CLIP_END_POSITION_MS_EXTRA = "clip_end_position_ms"; @@ -89,6 +90,9 @@ public static void addToIntent(List mediaItems, Intent intent) { MediaItem mediaItem = mediaItems.get(0); MediaItem.PlaybackProperties playbackProperties = checkNotNull(mediaItem.playbackProperties); intent.setAction(ACTION_VIEW).setData(mediaItem.playbackProperties.uri); + if (mediaItem.mediaMetadata.title != null) { + intent.putExtra(TITLE_EXTRA, mediaItem.mediaMetadata.title); + } addPlaybackPropertiesToIntent(playbackProperties, intent, /* extrasKeySuffix= */ ""); addClippingPropertiesToIntent( mediaItem.clippingProperties, intent, /* extrasKeySuffix= */ ""); @@ -102,6 +106,9 @@ public static void addToIntent(List mediaItems, Intent intent) { addPlaybackPropertiesToIntent(playbackProperties, intent, /* extrasKeySuffix= */ "_" + i); addClippingPropertiesToIntent( mediaItem.clippingProperties, intent, /* extrasKeySuffix= */ "_" + i); + if (mediaItem.mediaMetadata.title != null) { + intent.putExtra(TITLE_EXTRA + ("_" + i), mediaItem.mediaMetadata.title); + } } } } @@ -109,10 +116,12 @@ public static void addToIntent(List mediaItems, Intent intent) { private static MediaItem createMediaItemFromIntent( Uri uri, Intent intent, String extrasKeySuffix) { @Nullable String mimeType = intent.getStringExtra(MIME_TYPE_EXTRA + extrasKeySuffix); + @Nullable String title = intent.getStringExtra(TITLE_EXTRA + extrasKeySuffix); MediaItem.Builder builder = new MediaItem.Builder() .setUri(uri) .setMimeType(mimeType) + .setMediaMetadata(new MediaMetadata.Builder().setTitle(title).build()) .setAdTagUri(intent.getStringExtra(AD_TAG_URI_EXTRA + extrasKeySuffix)) .setSubtitles(createSubtitlesFromIntent(intent, extrasKeySuffix)) .setClipStartPositionMs(