Notification action icons prototype.

chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java

 // Copyright 2014 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.notifications;
 
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ skipping 402 matching lines @@
      *            if present. If no matching previous notification is present, the new one will just
      *            be added.
      * @param title Title to be displayed in the notification.
      * @param body Message to be displayed in the notification. Will be trimmed to one line of
      *             text by the Android notification system.
      * @param icon Icon to be displayed in the notification. Valid Bitmap icons will be scaled to
      *             the platforms, whereas a default icon will be generated for invalid Bitmaps.
      * @param vibrationPattern Vibration pattern following the Web Vibration syntax.
      * @param silent Whether the default sound, vibration and lights should be suppressed.
      * @param actionTitles Titles of actions to display alongside the notification.
+     * @param actionIcons Icons of actions to display alongside the notification.
      * @see https://developer.android.com/reference/android/app/Notification.html
      */
     @CalledByNative
     private void displayNotification(long persistentNotificationId, String origin, String profileId,
             boolean incognito, String tag, String title, String body, Bitmap icon,
-            int[] vibrationPattern, boolean silent, String[] actionTitles) {
+            int[] vibrationPattern, boolean silent, String[] actionTitles, Bitmap[] actionIcons) {
+        if (actionTitles.length != actionIcons.length) {
+            throw new IllegalStateException("The number of action titles and icons must match.");
+        }
+
         Resources res = mAppContext.getResources();
 
         // Record whether it's known whether notifications can be shown to the user at all.
         RecordHistogram.recordEnumeratedHistogram(
                 "Notifications.AppNotificationStatus",
                 NotificationSystemStatusUtil.determineAppNotificationStatus(mAppContext),
                 NotificationSystemStatusUtil.APP_NOTIFICATIONS_STATUS_BOUNDARY);
 
         // Set up a pending intent for going to the settings screen for |origin|.
         Intent settingsIntent = PreferencesLauncher.createIntentForSettingsPage(
@@ skipping 18 matching lines @@
                         .setTitle(title)
                         .setBody(body)
                         .setLargeIcon(ensureNormalizedIcon(icon, origin))
                         .setSmallIcon(R.drawable.ic_chrome)
                         .setContentIntent(clickIntent)
                         .setDeleteIntent(closeIntent)
                         .setTicker(createTickerText(title, body))
                         .setOrigin(UrlUtilities.formatUrlForSecurityDisplay(
                                 origin, false /* showScheme */));
 
-        for (int actionIndex = 0; actionIndex < actionTitles.length; actionIndex++) {
-            notificationBuilder.addAction(0 /* actionIcon */, actionTitles[actionIndex],
-                    makePendingIntent(NotificationConstants.ACTION_CLICK_NOTIFICATION,
-                                                  persistentNotificationId, origin, profileId,
-                                                  incognito, tag, actionIndex));
+        // TODO: handle bitmaps for standard notifications as well.
+        if (useCustomLayouts()) {
+            CustomNotificationBuilder customBuilder =
+                    (CustomNotificationBuilder) notificationBuilder;
+            for (int actionIndex = 0; actionIndex < actionTitles.length; actionIndex++) {
+                customBuilder.addAction(actionIcons[actionIndex], actionTitles[actionIndex],
+                        makePendingIntent(NotificationConstants.ACTION_CLICK_NOTIFICATION,
+                                                persistentNotificationId, origin, profileId,
+                                                incognito, tag, actionIndex));
+            }
         }
 
         // If action buttons are displayed, there isn't room for the full Site Settings button
         // label and icon, so abbreviate it. This has the unfortunate side-effect of unnecessarily
         // abbreviating it on Android Wear also (crbug.com/576656). If custom layouts are enabled,
         // the label and icon provided here only affect Android Wear, so don't abbreviate them.
         boolean abbreviateSiteSettings = actionTitles.length > 0 && !useCustomLayouts();
         int settingsIconId = abbreviateSiteSettings ? 0 : R.drawable.settings_cog;
         CharSequence settingsTitle = abbreviateSiteSettings
                                      ? res.getString(R.string.notification_site_settings_button)
@@ skipping 163 matching lines @@
 
     private static native void nativeInitializeNotificationUIManager();
 
     private native void nativeOnNotificationClicked(long nativeNotificationUIManagerAndroid,
             long persistentNotificationId, String origin, String profileId, boolean incognito,
             String tag, int actionIndex);
     private native void nativeOnNotificationClosed(long nativeNotificationUIManagerAndroid,
             long persistentNotificationId, String origin, String profileId, boolean incognito,
             String tag, boolean byUser);
 }