Merge branch 'master' into request_2

# Conflicts:
#	app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
This commit is contained in:
Pavol Franek
2020-03-15 07:50:45 +01:00
4 changed files with 28 additions and 7 deletions

View File

@ -13,6 +13,7 @@ const val TIMER_STATE = "timer_state"
const val TIMER_VIBRATE = "timer_vibrate"
const val TIMER_SOUND_URI = "timer_sound_uri"
const val TIMER_SOUND_TITLE = "timer_sound_title"
const val TIMER_CHANNEL_ID = "timer_channel_id"
const val TIMER_LABEL = "timer_label"
const val TIMER_MAX_REMINDER_SECS = "timer_max_reminder_secs"
const val ALARM_MAX_REMINDER_SECS = "alarm_max_reminder_secs"