Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40901478 authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

Merge "Settings: Convert notifications to use NotificationChannel (2/2)" into oc-dev am: 860b608e 

am: 7eb56476

Change-Id: I8d9c6e314a1b02cafc9523fae31a06dabfad4465
parents 3795082c 7eb56476

src/com/android/settings/bluetooth/BluetoothPermissionRequest.java

+17 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.bluetooth;



import android.app.Notification;

import android.app.NotificationChannel;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.bluetooth.BluetoothDevice;
@@ -45,6 +46,12 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { 
    private static final String NOTIFICATION_TAG_PBAP = "Phonebook Access" ;

    private static final String NOTIFICATION_TAG_MAP = "Message Access";

    private static final String NOTIFICATION_TAG_SAP = "SIM Access";

    /* TODO: Consolidate this multiple defined but common channel ID with other

     * handlers that declare and use the same channel ID */

    private static final String BLUETOOTH_NOTIFICATION_CHANNEL =

        "bluetooth_notification_channel";



    private NotificationChannel mNotificationChannel = null;



    Context mContext;

    int mRequestType;
@@ -151,7 +158,16 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { 
                                deviceAlias, deviceAlias);

                        break;

                }

                Notification notification = new Notification.Builder(context)

                NotificationManager notificationManager =

                    (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

                if (mNotificationChannel == null) {

                    mNotificationChannel = new NotificationChannel(BLUETOOTH_NOTIFICATION_CHANNEL,

                            context.getString(R.string.bluetooth),

                            NotificationManager.IMPORTANCE_HIGH);

                    notificationManager.createNotificationChannel(mNotificationChannel);

                }

                Notification notification = new Notification.Builder(context,

                        BLUETOOTH_NOTIFICATION_CHANNEL)

                        .setContentTitle(title)

                        .setTicker(message)

                        .setContentText(message)
@@ -169,9 +185,6 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver { 


                notification.flags |= Notification.FLAG_NO_CLEAR; // Cannot be set with the builder.



                NotificationManager notificationManager =

                    (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);



                notificationManager.notify(getNotificationTag(mRequestType), NOTIFICATION_ID,

                        notification);

            }