[Media, UI] Change MediaNotification style to MediaStyle

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.media.ui;
 
 import android.app.Activity;
+import android.graphics.Bitmap;
 import android.media.AudioManager;
 import android.text.TextUtils;
 
 import org.chromium.base.ApplicationStatus;
 import org.chromium.base.Log;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.metrics.MediaSessionUMA;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;
 import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
 import org.chromium.content_public.common.MediaMetadata;
 import org.chromium.ui.base.WindowAndroid;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 
 /**
  * A tab helper responsible for enabling/disabling media controls and passing
  * media actions from the controls to the {@link org.chromium.content.browser.MediaSession}
  */
 public class MediaSessionTabHelper {
     private static final String TAG = "MediaSession";
 
     private static final String UNICODE_PLAY_CHARACTER = "\u25B6";
 
     private Tab mTab;
+    private Bitmap mFavicon = null;
+    private String mOrigin = null;
     private WebContents mWebContents;
     private WebContentsObserver mWebContentsObserver;
     private int mPreviousVolumeControlStream = AudioManager.USE_DEFAULT_STREAM_TYPE;
     private MediaNotificationInfo.Builder mNotificationInfoBuilder = null;
     private MediaMetadata mFallbackMetadata;
 
     private MediaNotificationListener mControlsListener = new MediaNotificationListener() {
         @Override
         public void onPlay(int actionSource) {
             MediaSessionUMA
@@ skipping 39 matching lines @@
                 super.destroy();
             }
 
             @Override
             public void mediaSessionStateChanged(boolean isControllable, boolean isPaused,
                     MediaMetadata metadata) {
                 if (!isControllable) {
                     hideNotification();
                     return;
                 }
-                String origin = mTab.getUrl();
-                try {
-                    origin = UrlUtilities.formatUrlForSecurityDisplay(new URI(origin), true);
-                } catch (URISyntaxException e) {
-                    Log.e(TAG, "Unable to parse the origin from the URL. "
-                            + "Showing the full URL instead.");
-                }
 
                 mFallbackMetadata = null;
 
                 // The page's title is used as a placeholder if no title is specified in the
                 // metadata.
                 if (TextUtils.isEmpty(metadata.getTitle())) {
                     mFallbackMetadata = new MediaMetadata(
                             sanitizeMediaTitle(mTab.getTitle()),
                             metadata.getArtist(),
                             metadata.getAlbum());
                     metadata = mFallbackMetadata;
                 }
 
                 mNotificationInfoBuilder = new MediaNotificationInfo.Builder()
                         .setMetadata(metadata)
                         .setPaused(isPaused)
-                        .setOrigin(origin)
+                        .setOrigin(mOrigin)
                         .setTabId(mTab.getId())
                         .setPrivate(mTab.isIncognito())
                         .setIcon(R.drawable.audio_playing)
+                        .setLargeIcon(mFavicon)
                         .setActions(MediaNotificationInfo.ACTION_PLAY_PAUSE
                                 | MediaNotificationInfo.ACTION_SWIPEAWAY)
                         .setContentIntent(Tab.createBringTabToFrontIntent(mTab.getId()))
                         .setId(R.id.media_playback_notification)
                         .setListener(mControlsListener);
 
                 MediaNotificationManager.show(ApplicationStatus.getApplicationContext(),
                         mNotificationInfoBuilder.build());
 
                 Activity activity = getActivityFromTab(mTab);
@@ skipping 19 matching lines @@
     }
 
     private final TabObserver mTabObserver = new EmptyTabObserver() {
         @Override
         public void onContentChanged(Tab tab) {
             assert tab == mTab;
             setWebContents(tab.getWebContents());
         }
 
         @Override
+        public void onFaviconUpdated(Tab tab, Bitmap icon) {
+            assert tab == mTab;
+            updateFavicon(icon);

[mlamouri (slow - plz ping), 2016/04/07 19:47:34]

Maybe `updateFavicon` could return a boolean saying whether the favicon was
actually updated so we can early return if it wasn't?

[Zhiqiang Zhang (Slow), 2016/04/11 09:26:28]

Done.

+
+            if (mNotificationInfoBuilder == null) return;
+
+            mNotificationInfoBuilder.setLargeIcon(mFavicon);
+            MediaNotificationManager.show(ApplicationStatus.getApplicationContext(),
+                    mNotificationInfoBuilder.build());
+        }
+
+        @Override
+        public void onUrlUpdated(Tab tab) {
+            assert tab == mTab;
+
+            String origin = mTab.getUrl();
+            try {
+                origin = UrlUtilities.formatUrlForSecurityDisplay(new URI(origin), true);
+            } catch (URISyntaxException e) {
+                Log.e(TAG, "Unable to parse the origin from the URL. "
+                          + "Using the full URL instead.");
+            }
+
+            if (mOrigin != null && mOrigin.equals(origin)) return;
+            mOrigin = origin;
+            mFavicon = null;
+
+            if (mNotificationInfoBuilder == null) return;
+
+            mNotificationInfoBuilder.setLargeIcon(mFavicon);

[mlamouri (slow - plz ping), 2016/04/07 19:47:34]

Shouldn't you call mNotificationInfoBuilder.setOrigin(mOrigin)?

[Zhiqiang Zhang (Slow), 2016/04/11 09:26:28]

I think not. mNotificationInfoBuilder can be null if the notification is hidden,
but we still want to keep track of the origin in case a media starts to play
after the page is loaded.

+            MediaNotificationManager.show(ApplicationStatus.getApplicationContext(),
+                    mNotificationInfoBuilder.build());
+        }
+
+        @Override
         public void onTitleUpdated(Tab tab) {
             assert tab == mTab;
             if (mNotificationInfoBuilder == null || mFallbackMetadata == null) return;
 
             mFallbackMetadata = new MediaMetadata(mFallbackMetadata);
             mFallbackMetadata.setTitle(sanitizeMediaTitle(mTab.getTitle()));
             mNotificationInfoBuilder.setMetadata(mFallbackMetadata);
 
             MediaNotificationManager.show(ApplicationStatus.getApplicationContext(),
                     mNotificationInfoBuilder.build());
@@ skipping 61 matching lines @@
         assert false;
         return MediaSessionUMA.MEDIA_SESSION_ACTION_SOURCE_MAX;
     }
 
     private Activity getActivityFromTab(Tab tab) {
         WindowAndroid windowAndroid = tab.getWindowAndroid();
         if (windowAndroid == null) return null;
 
         return windowAndroid.getActivity().get();
     }
+
+    private void updateFavicon(Bitmap icon) {
+        if (icon == null) return;
+        if (icon.getWidth() < 112 || icon.getHeight() < 112) return;

[mlamouri (slow - plz ping), 2016/04/07 19:47:34]

Why 112px instead of the values from the design doc?

[Zhiqiang Zhang (Slow), 2016/04/11 09:26:28]

Done.

+        if (mFavicon != null
+                && (icon.getWidth() < mFavicon.getWidth()
+                        || icon.getHeight() < mFavicon.getHeight())) {
+            return;
+        }
+        mFavicon = icon;
+    }
 }