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

Merge "Bluetooth: Make notifications local-only" am: 348a7085fa

Browse Source 
am: 620fe71520

Change-Id: I3df0a009c7fc6184ea1176f6953748c5031d76cd
This commit is contained in:
Marie Janssen
2017-06-22 15:41:55 +00:00
committed by android-build-merger
parent a3821d019a 620fe71520
commit 3cc4522cbc
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/bluetooth/BluetoothPairingService.java
View File

@@ -120,7 +120,8 @@ public final class BluetoothPairingService extends Service {
Notification.Builder builder = new Notification.Builder(this, Notification.Builder builder = new Notification.Builder(this,
BLUETOOTH_NOTIFICATION_CHANNEL) BLUETOOTH_NOTIFICATION_CHANNEL)
.setSmallIcon(android.R.drawable.stat_sys_data_bluetooth) .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
.setTicker(res.getString(R.string.bluetooth_notif_ticker)); .setTicker(res.getString(R.string.bluetooth_notif_ticker))
.setLocalOnly(true);
PendingIntent pairIntent = PendingIntent.getActivity(this, 0, PendingIntent pairIntent = PendingIntent.getActivity(this, 0,
getPairingDialogIntent(this, intent), PendingIntent.FLAG_ONE_SHOT); getPairingDialogIntent(this, intent), PendingIntent.FLAG_ONE_SHOT);

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

@@ -181,6 +181,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
.setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent, 0)) .setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent, 0))
.setColor(context.getColor( .setColor(context.getColor(
com.android.internal.R.color.system_notification_accent_color)) com.android.internal.R.color.system_notification_accent_color))
.setLocalOnly(true)
.build(); .build();
notification.flags |= Notification.FLAG_NO_CLEAR; // Cannot be set with the builder. notification.flags |= Notification.FLAG_NO_CLEAR; // Cannot be set with the builder.