caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1802 from Andries-Smit/wear-less-vibrations

Browse source 
Wear OS less vibrations during progress
This commit is contained in:
Milos Kozak 2022-06-02 13:08:08 +02:00 committed by GitHub
commit 87a404f71a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wear/src/main/java/info/nightscout/androidaps/comm/DataHandlerWear.kt
View file

@ -200,6 +200,7 @@ class DataHandlerWear @Inject constructor(
.setContentIntent(cancelPendingIntent) .setContentIntent(cancelPendingIntent)
.setPriority(NotificationCompat.PRIORITY_MAX) .setPriority(NotificationCompat.PRIORITY_MAX)
.setVibrate(vibratePattern) .setVibrate(vibratePattern)
.setOnlyAlertOnce(true)
.addAction(R.drawable.ic_cancel, context.getString(R.string.cancel_bolus), cancelPendingIntent) .addAction(R.drawable.ic_cancel, context.getString(R.string.cancel_bolus), cancelPendingIntent)
val notificationManager = NotificationManagerCompat.from(context) val notificationManager = NotificationManagerCompat.from(context)
notificationManager.notify(DataLayerListenerServiceWear.BOLUS_PROGRESS_NOTIF_ID, notificationBuilder.build()) notificationManager.notify(DataLayerListenerServiceWear.BOLUS_PROGRESS_NOTIF_ID, notificationBuilder.build())
@ -214,18 +215,20 @@ class DataHandlerWear @Inject constructor(
longArrayOf(0, 50, 1000), longArrayOf(0, 50, 1000),
DataLayerListenerServiceWear.AAPS_NOTIFY_CHANNEL_ID_BOLUS_PROGRESS, DataLayerListenerServiceWear.AAPS_NOTIFY_CHANNEL_ID_BOLUS_PROGRESS,
context.getString(R.string.bolus_progress_channel_name), context.getString(R.string.bolus_progress_channel_name),
context.getString(R.string.bolus_progress_channel_description) context.getString(R.string.bolus_progress_channel_description),
NotificationManager.IMPORTANCE_HIGH
) )
createNotificationChannel( createNotificationChannel(
longArrayOf(0, 1, 1000), longArrayOf(0),
DataLayerListenerServiceWear.AAPS_NOTIFY_CHANNEL_ID_BOLUS_PROGRESS_SILENT, DataLayerListenerServiceWear.AAPS_NOTIFY_CHANNEL_ID_BOLUS_PROGRESS_SILENT,
context.getString(R.string.bolus_progress_silent_channel_name), context.getString(R.string.bolus_progress_silent_channel_name),
context.getString(R.string.bolus_progress_silent_channel_description) context.getString(R.string.bolus_progress_silent_channel_description),
NotificationManager.IMPORTANCE_LOW
) )
} }
@TargetApi(value = 26) private fun createNotificationChannel(vibratePattern: LongArray, channelID: String, name: CharSequence, description: String) { @TargetApi(value = 26) private fun createNotificationChannel(vibratePattern: LongArray, channelID: String, name: CharSequence, description: String, importance: Int) {
val channel = NotificationChannel(channelID, name, NotificationManager.IMPORTANCE_HIGH) val channel = NotificationChannel(channelID, name, importance)
channel.description = description channel.description = description
channel.enableVibration(true) channel.enableVibration(true)
channel.vibrationPattern = vibratePattern channel.vibrationPattern = vibratePattern