[Media, UI] Change MediaNotification style to MediaStyle

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationInfo.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.content.Intent;
 import android.graphics.Bitmap;
 import android.text.TextUtils;
 
@@ skipping 31 matching lines @@
      * Use this class to construct an instance of {@link MediaNotificationInfo}.
      */
     public static final class Builder {
 
         private MediaMetadata mMetadata = null;
         private boolean mIsPaused = false;
         private String mOrigin = "";
         private int mTabId = Tab.INVALID_TAB_ID;
         private boolean mIsPrivate = true;
         private int mIcon = -1;
+        private Bitmap mLargeIcon = null;
         private int mActions = ACTION_PLAY_PAUSE | ACTION_SWIPEAWAY;
         private int mId = INVALID_ID;
         private Intent mContentIntent = null;
-        private Bitmap mImage = null;
         private MediaNotificationListener mListener = null;
 
         /**
          * Initializes the builder with the default values.
          */
         public Builder() {
         }
 
         public MediaNotificationInfo build() {
             assert mMetadata != null;
             assert mOrigin != null;
             assert mListener != null;
 
             return new MediaNotificationInfo(
                     mMetadata,
                     mIsPaused,
                     mOrigin,
                     mTabId,
                     mIsPrivate,
                     mIcon,
+                    mLargeIcon,
                     mActions,
                     mId,
-                    mImage,
                     mContentIntent,
                     mListener);
         }
 
         public Builder setMetadata(MediaMetadata metadata) {
             mMetadata = metadata;
             return this;
         }
 
         public Builder setPaused(boolean isPaused) {
@@ skipping 14 matching lines @@
         public Builder setPrivate(boolean isPrivate) {
             mIsPrivate = isPrivate;
             return this;
         }
 
         public Builder setIcon(int icon) {
             mIcon = icon;
             return this;
         }
 
+        public Builder setLargeIcon(Bitmap icon) {
+            mLargeIcon = icon;
+            return this;
+        }
+
         public Builder setActions(int actions) {
             mActions = actions;
             return this;
         }
 
         public Builder setId(int id) {
             mId = id;
             return this;
         }
 
-        public Builder setImage(Bitmap image) {
-            mImage = image;
-            return this;
-        }
-
         public Builder setContentIntent(Intent intent) {
             mContentIntent = intent;
             return this;
         }
 
         public Builder setListener(MediaNotificationListener listener) {
             mListener = listener;
             return this;
         }
     }
@@ skipping 27 matching lines @@
      * Whether the media notification should be considered as private.
      */
     public final boolean isPrivate;
 
     /**
      * The id of the notification icon from R.drawable.
      */
     public final int icon;
 
     /**
+     * The Bitmap resource used for a large icon.
+     */
+    public final Bitmap largeIcon;
+
+    /**
      * The id to use for the notification itself.
      */
     public final int id;
 
     /**
-     * The bitmap of the image, if any.
-     */
-    public final Bitmap image;
-
-    /**
      * The intent to send when the notification is selected.
      */
     public final Intent contentIntent;
 
     /**
      * The listener for the control events.
      */
     public final MediaNotificationListener listener;
 
     /**
@@ skipping 17 matching lines @@
         return (mActions & ACTION_SWIPEAWAY) != 0;
     }
 
     /**
      * Create a new MediaNotificationInfo.
      * @param metadata The metadata associated with the media.
      * @param isPaused The current state of the media, paused or not.
      * @param origin The origin of the tab containing the media.
      * @param tabId The id of the tab containing the media.
      * @param isPrivate Whether the media notification should be considered as private.
-     * @param image An image associated with the media, displayed in icons etc..
      * @param contentIntent the intent to send when the notification is selected.
      * @param listener The listener for the control events.
      */
     private MediaNotificationInfo(
             MediaMetadata metadata,
             boolean isPaused,
             String origin,
             int tabId,
             boolean isPrivate,
             int icon,
+            Bitmap largeIcon,
             int actions,
             int id,
-            Bitmap image,
             Intent contentIntent,
             MediaNotificationListener listener) {
         this.metadata = metadata;
         this.isPaused = isPaused;
         this.origin = origin;
         this.tabId = tabId;
         this.isPrivate = isPrivate;
         this.icon = icon;
+        this.largeIcon = largeIcon;
         this.mActions = actions;
         this.id = id;
         this.contentIntent = contentIntent;
-        this.image = image;
         this.listener = listener;
     }
 
     @Override
     public boolean equals(Object obj) {
         if (obj == this) return true;
         if (!(obj instanceof MediaNotificationInfo)) return false;
 
         MediaNotificationInfo other = (MediaNotificationInfo) obj;
         return isPaused == other.isPaused
                 && isPrivate == other.isPrivate
                 && tabId == other.tabId
                 && icon == other.icon
+                && (largeIcon == other.largeIcon
+                        || (largeIcon != null && largeIcon.sameAs(other.largeIcon)))
                 && mActions == other.mActions
                 && id == other.id
                 && (metadata == other.metadata
                         || (metadata != null && metadata.equals(other.metadata)))
                 && TextUtils.equals(origin, other.origin)
-                && (image == other.image || (image != null && image.sameAs(other.image)))
                 && (contentIntent == other.contentIntent
                         || (contentIntent != null && contentIntent.equals(other.contentIntent)))
                 && (listener == other.listener
                         || (listener != null && listener.equals(other.listener)));
     }
 
     @Override
     public int hashCode() {
         int result = isPaused ? 1 : 0;
         result = 31 * result + (isPrivate ? 1 : 0);
         result = 31 * result + (metadata == null ? 0 : metadata.hashCode());
         result = 31 * result + (origin == null ? 0 : origin.hashCode());
-        result = 31 * result + (image == null ? 0 : image.hashCode());
         result = 31 * result + (contentIntent == null ? 0 : contentIntent.hashCode());
         result = 31 * result + tabId;
         result = 31 * result + icon;
+        result = 31 * result + (largeIcon == null ? 0 : largeIcon.hashCode());
         result = 31 * result + mActions;
         result = 31 * result + id;
         result = 31 * result + listener.hashCode();
         return result;
     }
 }