chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java - Issue 1458703003: Media Session API: use MediaMetadata in the browser process.

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

Issue 1458703003: Media Session API: use MediaMetadata in the browser process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_session_browser_side

Patch Set: nits Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationInfo.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

index 67cd06f5aa0b811c30b9dcae8cedfc81d4260f19..fa664a7eda125224db1427017dbf456ef0ea5d81 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

@@ -24,6 +24,7 @@ import android.support.v4.media.MediaMetadataCompat;

import android.support.v4.media.session.MediaSessionCompat;

import android.support.v4.media.session.PlaybackStateCompat;

import android.support.v7.media.MediaRouter;

+import android.text.TextUtils;

import android.util.SparseArray;

import android.view.KeyEvent;

import android.view.View;

@@ -502,7 +503,7 @@ public class MediaNotificationManager {

playPauseButtonId = R.id.button2;

}

- contentView.setTextViewText(R.id.title, mMediaNotificationInfo.title);

+ contentView.setTextViewText(R.id.title, mMediaNotificationInfo.metadata.getTitle());

contentView.setTextViewText(R.id.status, mMediaNotificationInfo.origin);

if (mNotificationIcon != null) {

contentView.setImageViewBitmap(R.id.icon, mNotificationIcon);

@@ -541,7 +542,7 @@ public class MediaNotificationManager {

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE,

- mMediaNotificationInfo.title);

+ mMediaNotificationInfo.metadata.getTitle());

metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_SUBTITLE,

mMediaNotificationInfo.origin);

metadataBuilder.putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON,

@@ -554,12 +555,21 @@ public class MediaNotificationManager {

}

} else {

metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_TITLE,

- mMediaNotificationInfo.title);

+ mMediaNotificationInfo.metadata.getTitle());

metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST,

mMediaNotificationInfo.origin);

metadataBuilder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, mediaSessionImage);

}

+ if (!TextUtils.isEmpty(mMediaNotificationInfo.metadata.getArtist())) {

+ metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST,

+ mMediaNotificationInfo.metadata.getArtist());

+ }

+ if (!TextUtils.isEmpty(mMediaNotificationInfo.metadata.getAlbum())) {

+ metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_ALBUM,

+ mMediaNotificationInfo.metadata.getAlbum());

+ }

return metadataBuilder.build();

}