Migrating media notifications to ChromeNotificationBuilder

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.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.Notification;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
@@ skipping 18 matching lines @@
 import android.support.v7.app.NotificationCompat;
 import android.support.v7.media.MediaRouter;
 import android.text.TextUtils;
 import android.util.SparseArray;
 import android.view.KeyEvent;
 
 import org.chromium.base.SysUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.blink.mojom.MediaSessionAction;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;
 import org.chromium.chrome.browser.notifications.NotificationConstants;
 import org.chromium.content_public.common.MediaMetadata;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import javax.annotation.Nullable;
 
@@ skipping 28 matching lines @@
     // Maps the notification ids to their corresponding notification managers.
     private static SparseArray<MediaNotificationManager> sManagers;
 
     private final Context mContext;
 
     // ListenerService running for the notification. Only non-null when showing.
     private ListenerService mService;
 
     private SparseArray<MediaButtonInfo> mActionToButtonInfo;
 
-    private NotificationCompat.Builder mNotificationBuilder;
+    private ChromeNotificationBuilder mNotificationBuilder;
 
     private Bitmap mDefaultNotificationLargeIcon;
 
     // |mMediaNotificationInfo| should be not null if and only if the notification is showing.
     private MediaNotificationInfo mMediaNotificationInfo;
 
     private MediaSessionCompat mMediaSession;
 
     private final MediaSessionCompat.Callback mMediaSessionCallback =
             new MediaSessionCompat.Callback() {
@@ skipping 433 matching lines @@
         return sManagers.get(notificationId);
     }
 
     @VisibleForTesting
     static boolean hasManagerForTesting(int notificationId) {
         return getManager(notificationId) != null;
     }
 
     @VisibleForTesting
     @Nullable
-    static NotificationCompat.Builder getNotificationBuilderForTesting(
-            int notificationId) {
+    static ChromeNotificationBuilder getNotificationBuilderForTesting(int notificationId) {
         MediaNotificationManager manager = getManager(notificationId);
         if (manager == null) return null;
 
         return manager.mNotificationBuilder;
     }
 
     @VisibleForTesting
     @Nullable
     static MediaNotificationInfo getMediaNotificationInfoForTesting(
             int notificationId) {
@@ skipping 156 matching lines @@
         return metadataBuilder.build();
     }
 
     private void updateNotification() {
         if (mService == null) return;
 
         if (mMediaNotificationInfo == null) return;
 
         updateMediaSession();
 
-        mNotificationBuilder = new NotificationCompat.Builder(mContext);
+        mNotificationBuilder =
+                ((ChromeApplication) mContext)

[nyquist, 2017/02/28 07:33:17]

I think you need to do mContext.getApplicationContext() to ensure this is in
fact the application context, and not an activity context.

[mlamouri (slow - plz ping), 2017/02/28 15:23:11]

+1. The context you are getting here is probably not the one you are looking
for.

[awdf, 2017/02/28 18:09:05]

Done.

+                        .createChromeNotificationBuilder(true,
+                                NotificationConstants.CATEGORY_ID_GENERAL,

[mlamouri (slow - plz ping), 2017/02/28 15:23:11]

Should this be media?

[awdf, 2017/02/28 18:09:05]

As discussed, we're going with GENERAL for now.

+                                mContext.getString(R.string.notification_category_general));
         setMediaStyleLayoutForNotificationBuilder(mNotificationBuilder);
 
         mNotificationBuilder.setSmallIcon(mMediaNotificationInfo.notificationSmallIcon);
         mNotificationBuilder.setAutoCancel(false);
         mNotificationBuilder.setLocalOnly(true);
         mNotificationBuilder.setGroup(getNotificationGroupName());
         mNotificationBuilder.setGroupSummary(true);
 
         if (mMediaNotificationInfo.supportsSwipeAway()) {
             mNotificationBuilder.setOngoing(!mMediaNotificationInfo.isPaused);
@@ skipping 111 matching lines @@
     }
 
     private void activateAndroidMediaSession(int tabId) {
         if (mMediaNotificationInfo == null) return;
         if (mMediaNotificationInfo.tabId != tabId) return;
         if (!mMediaNotificationInfo.supportsPlayPause() || mMediaNotificationInfo.isPaused) return;
         if (mMediaSession == null) return;
         mMediaSession.setActive(true);
     }
 
-    private void setMediaStyleLayoutForNotificationBuilder(NotificationCompat.Builder builder) {
+    private void setMediaStyleLayoutForNotificationBuilder(ChromeNotificationBuilder builder) {
         setMediaStyleNotificationText(builder);
         if (!mMediaNotificationInfo.supportsPlayPause()) {
             builder.setLargeIcon(null);
         } else if (mMediaNotificationInfo.notificationLargeIcon != null) {
             builder.setLargeIcon(mMediaNotificationInfo.notificationLargeIcon);
         } else if (!isRunningN()) {
             if (mDefaultNotificationLargeIcon == null) {
                 int resourceId = (mMediaNotificationInfo.defaultNotificationLargeIcon != 0)
                         ? mMediaNotificationInfo.defaultNotificationLargeIcon
                         : R.drawable.audio_playing_square;
                 mDefaultNotificationLargeIcon = downscaleIconToIdealSize(
                     BitmapFactory.decodeResource(mContext.getResources(), resourceId));
             }
             builder.setLargeIcon(mDefaultNotificationLargeIcon);
         }
         // TODO(zqzhang): It's weird that setShowWhen() don't work on K. Calling setWhen() to force
         // removing the time.
         builder.setShowWhen(false).setWhen(0);
 
         addNotificationButtons(builder);
     }
 
-    private void addNotificationButtons(NotificationCompat.Builder builder) {
+    private void addNotificationButtons(ChromeNotificationBuilder builder) {
         Set<Integer> actions = new HashSet<>();
 
         // TODO(zqzhang): handle other actions when play/pause is not supported? See
         // https://crbug.com/667500
         if (mMediaNotificationInfo.supportsPlayPause()) {
             actions.addAll(mMediaNotificationInfo.mediaSessionActions);
             if (mMediaNotificationInfo.isPaused) {
                 actions.remove(MediaSessionAction.PAUSE);
                 actions.add(MediaSessionAction.PLAY);
             } else {
@@ skipping 10 matching lines @@
 
         for (int action : bigViewActions) {
             MediaButtonInfo buttonInfo = mActionToButtonInfo.get(action);
             builder.addAction(buttonInfo.iconResId,
                     mContext.getResources().getString(buttonInfo.descriptionResId),
                     createPendingIntent(buttonInfo.intentString));
         }
 
         // Only apply MediaStyle when NotificationInfo supports play/pause.
         if (mMediaNotificationInfo.supportsPlayPause()) {
-            NotificationCompat.MediaStyle style = new NotificationCompat.MediaStyle();
-            style.setMediaSession(mMediaSession.getSessionToken());
-
-            int[] compactViewActionIndices = computeCompactViewActionIndices(bigViewActions);
-
-            style.setShowActionsInCompactView(compactViewActionIndices);
-            style.setCancelButtonIntent(createPendingIntent(ListenerService.ACTION_CANCEL));
-            style.setShowCancelButton(true);
-            builder.setStyle(style);
+            builder.setMediaStyle(mMediaSession, computeCompactViewActionIndices(bigViewActions),
+                    createPendingIntent(ListenerService.ACTION_CANCEL), true);
         }
     }
 
     private Bitmap drawableToBitmap(Drawable drawable) {
         if (!(drawable instanceof BitmapDrawable)) return null;
 
         BitmapDrawable bitmapDrawable = (BitmapDrawable) drawable;
         return bitmapDrawable.getBitmap();
     }
 
-    private void setMediaStyleNotificationText(NotificationCompat.Builder builder) {
+    private void setMediaStyleNotificationText(ChromeNotificationBuilder builder) {
         builder.setContentTitle(mMediaNotificationInfo.metadata.getTitle());
         String artistAndAlbumText = getArtistAndAlbumText(mMediaNotificationInfo.metadata);
         if (isRunningN() || !artistAndAlbumText.isEmpty()) {
             builder.setContentText(artistAndAlbumText);
             builder.setSubText(mMediaNotificationInfo.origin);
         } else {
             // Leaving ContentText empty looks bad, so move origin up to the ContentText.
             builder.setContentText(mMediaNotificationInfo.origin);
         }
     }
@@ skipping 133 matching lines @@
 
         return actionsArray;
     }
 
     static int[] convertIntegerListToIntArray(List<Integer> intList) {
         int[] intArray = new int[intList.size()];
         for (int i = 0; i < intList.size(); ++i) intArray[i] = i;
         return intArray;
     }
 }