[Android] Give public versions of notifications a channel

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

 // Copyright 2016 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.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.RemoteInput;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Icon;
 import android.os.Build;
 
 import org.chromium.base.VisibleForTesting;
+import org.chromium.chrome.browser.notifications.channels.ChannelDefinitions;
 import org.chromium.chrome.browser.widget.RoundedIconGenerator;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Nullable;
 
 /**
  * Abstract base class for building a notification. Stores all given arguments for later use.
@@ skipping 317 matching lines @@
         }
         return icon;
     }
 
     /**
      * Creates a public version of the notification to be displayed in sensitive contexts, such as
      * on the lockscreen, displaying just the site origin and badge or generated icon.
      */
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     protected Notification createPublicNotification(Context context) {
-        // Use Android's Notification.Builder because we want the default small icon behaviour.
-        Notification.Builder builder =
-                new Notification.Builder(context)
+        // Use a non-compat builder because we want the default small icon behaviour.
+        ChromeNotificationBuilder builder =
+                NotificationBuilderFactory
+                        .createChromeNotificationBuilder(
+                                false /* preferCompat */, ChannelDefinitions.CHANNEL_ID_SITES)
                         .setContentText(context.getString(
                                 org.chromium.chrome.R.string.notification_hidden_text))
                         .setSmallIcon(org.chromium.chrome.R.drawable.ic_chrome);
 
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
             // On N, 'subtext' displays at the top of the notification and this looks better.
             builder.setSubText(mOrigin);
         } else {
             // Set origin as title on L & M, because they look odd without one.
             builder.setContentTitle(mOrigin);
@@ skipping 108 matching lines @@
         int largeIconWidthPx =
                 resources.getDimensionPixelSize(android.R.dimen.notification_large_icon_width);
         int largeIconHeightPx =
                 resources.getDimensionPixelSize(android.R.dimen.notification_large_icon_height);
         float density = resources.getDisplayMetrics().density;
         int cornerRadiusPx = Math.min(largeIconWidthPx, largeIconHeightPx) / 2;
         return new RoundedIconGenerator(largeIconWidthPx, largeIconHeightPx, cornerRadiusPx,
                 NOTIFICATION_ICON_BG_COLOR, NOTIFICATION_ICON_TEXT_SIZE_DP * density);
     }
 }