PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 860b608e41

Change-Id: If246a2f7d340b1d21c805322fa10f0c2fed8115c
This commit is contained in:
Hemant Gupta
2017-05-20 01:37:14 +00:00
committed by android-build-merger
parent 2ca8635a5e 860b608e41
commit 7eb5647656
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.bluetooth; package com.android.settings.bluetooth;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.bluetooth.BluetoothDevice; 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_PBAP = "Phonebook Access" ;
private static final String NOTIFICATION_TAG_MAP = "Message Access"; private static final String NOTIFICATION_TAG_MAP = "Message Access";
private static final String NOTIFICATION_TAG_SAP = "SIM 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; Context mContext;
int mRequestType; int mRequestType;
@@ -151,7 +158,16 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
deviceAlias, deviceAlias); deviceAlias, deviceAlias);
break; 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) .setContentTitle(title)
.setTicker(message) .setTicker(message)
.setContentText(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. 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, notificationManager.notify(getNotificationTag(mRequestType), NOTIFICATION_ID,
notification); notification);
} }