Merge branch 'master' into feature/357-new-intents
This commit is contained in:
commit
3ed178c2f5
2 changed files with 3 additions and 3 deletions
|
@ -195,6 +195,7 @@ fun Context.getAlarmIntent(alarm: Alarm): PendingIntent {
|
|||
fun Context.cancelAlarmClock(alarm: Alarm) {
|
||||
val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
|
||||
alarmManager.cancel(getAlarmIntent(alarm))
|
||||
alarmManager.cancel(getEarlyAlarmDismissalIntent(alarm))
|
||||
}
|
||||
|
||||
fun Context.hideNotification(id: Int) {
|
||||
|
|
|
@ -32,8 +32,7 @@
|
|||
<string name="no_timers_found">Nessun contaminuti trovato</string>
|
||||
<string name="add_timer">Aggiungi contaminuti</string>
|
||||
<string name="upcoming_alarm">Allarme imminente</string>
|
||||
<string name="early_alarm_dismissal">Early alarm dismissal</string>
|
||||
|
||||
<string name="early_alarm_dismissal">Arresto anticipato dell\'allarme</string>
|
||||
<!--Timer-->
|
||||
<string name="timers_notification_msg">I contaminuti sono in funzione</string>
|
||||
<string name="timer_single_notification_label_msg">Il contaminuti per %s è in funzione</string>
|
||||
|
@ -57,4 +56,4 @@
|
|||
Haven't found some strings? There's more at
|
||||
https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
|
||||
-->
|
||||
</resources>
|
||||
</resources>
|
Loading…
Reference in a new issue