summaryrefslogtreecommitdiff
path: root/apps/action.c
diff options
context:
space:
mode:
authorDana Conrad <dconrad@fastmail.com>2021-03-20 15:11:05 -0500
committerWilliam Wilgus <me.theuser@yahoo.com>2021-03-23 02:05:20 +0000
commit1c54c5227b4b8640c979000a340631dbeb190111 (patch)
tree013f12d519da9240f3b995544d19e58bc75bbffb /apps/action.c
parentbf9fdb13c4d38f19aa303b6fc88ee3a97ca6c441 (diff)
downloadrockbox-1c54c5227b4b8640c979000a340631dbeb190111.tar.gz
rockbox-1c54c5227b4b8640c979000a340631dbeb190111.zip
Add disable setting for all softlock notifications
Tested on erosq Added ability to disable all softlock notifications. Setting is "Disable All Lock Notifications" under Advanced Key Lock Settings. Tested to make sure it doesn't interfere with backlight exemptions, keylock exemptions, or first press enables backlight only. When enabled, this overrules the existing Disable Notify setting, which only disables the reminders when a button is pressed while the device is already locked. Also changed phrases in the Advanced Key Lock settings menu to make it more obvious what the options do. Changed LANG_ACTION_PLAY, LANG_ACTION_SEEK, and LANG_ACTION_SKIP from "[button]" to "Exempt [button]". These language changes will also affect the Backlight Exemptions list, but the wording should be appropriate there as well. Added LANG_SOFTLOCK_DISABLE_ALL_NOTIFY and LANG_ACTION_VOLUME, changed LANG_VOLUME to LANG_ACTION_VOLUME in display_menu.c for consistency. Change-Id: I914fe154ba5d508a842165aea7c7755e4e6b9c57
Diffstat (limited to 'apps/action.c')
-rw-r--r--apps/action.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/apps/action.c b/apps/action.c
index 858a761219..f9602b967f 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -797,13 +797,16 @@ static inline void do_softlock(action_last_t *last, action_cur_t *cur)
797 sleep(HZ/2); 797 sleep(HZ/2);
798 } 798 }
799#endif 799#endif
800 if (last->keys_locked) 800 if (!has_flag(last->softlock_mask, SEL_ACTION_ALLNONOTIFY))
801 { 801 {
802 splash(HZ/2, ID2P(LANG_KEYLOCK_ON)); 802 if (last->keys_locked)
803 } 803 {
804 else 804 splash(HZ/2, ID2P(LANG_KEYLOCK_ON));
805 { 805 }
806 splash(HZ/2, ID2P(LANG_KEYLOCK_OFF)); 806 else
807 {
808 splash(HZ/2, ID2P(LANG_KEYLOCK_OFF));
809 }
807 } 810 }
808 811
809 action = ACTION_REDRAW; 812 action = ACTION_REDRAW;