fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-06-05 22:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

play the stopwatch reminder in the Alarm stream

Browse Source
This commit is contained in:
tibbi
2018-05-27 14:43:36 +02:00
parent 3a95fe601b
commit dc31b34db7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
View File

@ -251,9 +251,9 @@ fun Context.getTimerNotification(pendingIntent: PendingIntent, addDeleteIntent:
val channelId = "simple_timer_channel_$soundUri" val channelId = "simple_timer_channel_$soundUri"
if (isOreoPlus()) { if (isOreoPlus()) {
val audioAttributes = AudioAttributes.Builder() val audioAttributes = AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_NOTIFICATION) .setUsage(AudioAttributes.USAGE_ALARM)
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setLegacyStreamType(AudioManager.STREAM_SYSTEM) .setLegacyStreamType(AudioManager.STREAM_ALARM)
.setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED) .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED)
.build() .build()
@ -278,7 +278,7 @@ fun Context.getTimerNotification(pendingIntent: PendingIntent, addDeleteIntent:
.setPriority(Notification.PRIORITY_LOW) .setPriority(Notification.PRIORITY_LOW)
.setDefaults(Notification.DEFAULT_LIGHTS) .setDefaults(Notification.DEFAULT_LIGHTS)
.setAutoCancel(true) .setAutoCancel(true)
.setSound(Uri.parse(soundUri), AudioManager.STREAM_SYSTEM) .setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM)
.setChannelId(channelId) .setChannelId(channelId)
.addAction(R.drawable.ic_cross, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideTimerPendingIntent()) .addAction(R.drawable.ic_cross, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideTimerPendingIntent())

2
app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt
View File

@ -71,7 +71,7 @@ class TimerFragment : Fragment() {
} }
timer_sound.setOnClickListener { timer_sound.setOnClickListener {
SelectAlarmSoundDialog(activity as SimpleActivity, config.timerSoundUri, AudioManager.STREAM_SYSTEM, PICK_AUDIO_FILE_INTENT_ID, SelectAlarmSoundDialog(activity as SimpleActivity, config.timerSoundUri, AudioManager.STREAM_ALARM, PICK_AUDIO_FILE_INTENT_ID,
ALARM_SOUND_TYPE_ALARM, true, onAlarmPicked = { ALARM_SOUND_TYPE_ALARM, true, onAlarmPicked = {
if (it != null) { if (it != null) {
updateAlarmSound(it) updateAlarmSound(it)