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

2 files changed, 9 insertions, 8 deletions

diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index b4a3d3eb63..c72fb08fae 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -94,7 +94,7 @@ static int selectivebacklight_set_mask(void* param)
     (void)param;
      int mask = global_settings.bl_selective_actions_mask;
             struct s_mask_items maskitems[]={
-                                       {ID2P(LANG_VOLUME)   , SEL_ACTION_VOL},
+                                       {ID2P(LANG_ACTION_VOLUME)   , SEL_ACTION_VOL},
                                        {ID2P(LANG_ACTION_PLAY), SEL_ACTION_PLAY},
                                        {ID2P(LANG_ACTION_SEEK), SEL_ACTION_SEEK},
                                        {ID2P(LANG_ACTION_SKIP), SEL_ACTION_SKIP},
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 33d29b003c..a5daad01ce 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -83,17 +83,18 @@ static int selectivesoftlock_set_mask(void* param)
     (void)param;
 int mask = global_settings.bt_selective_softlock_actions_mask;
             struct s_mask_items maskitems[]={
-                                       {ID2P(LANG_VOLUME)     , SEL_ACTION_VOL},
-                                       {ID2P(LANG_ACTION_PLAY), SEL_ACTION_PLAY},
-                                       {ID2P(LANG_ACTION_SEEK), SEL_ACTION_SEEK},
-                                       {ID2P(LANG_ACTION_SKIP), SEL_ACTION_SKIP},
+                                       {ID2P(LANG_ACTION_VOLUME), SEL_ACTION_VOL},
+                                       {ID2P(LANG_ACTION_PLAY),   SEL_ACTION_PLAY},
+                                       {ID2P(LANG_ACTION_SEEK),   SEL_ACTION_SEEK},
+                                       {ID2P(LANG_ACTION_SKIP),   SEL_ACTION_SKIP},
  #ifdef HAVE_BACKLIGHT
-                            {ID2P(LANG_ACTION_AUTOLOCK_ON), SEL_ACTION_AUTOLOCK},
+                                       {ID2P(LANG_ACTION_AUTOLOCK_ON),    SEL_ACTION_AUTOLOCK},
  #endif
  #if defined(HAVE_TOUCHPAD) || defined(HAVE_TOUCHSCREEN)
-                        {ID2P(LANG_ACTION_DISABLE_TOUCH) , SEL_ACTION_NOTOUCH},
+                                       {ID2P(LANG_ACTION_DISABLE_TOUCH),  SEL_ACTION_NOTOUCH},
  #endif
-                         {ID2P(LANG_ACTION_DISABLE_NOTIFY), SEL_ACTION_NONOTIFY}
+                                       {ID2P(LANG_ACTION_DISABLE_NOTIFY), SEL_ACTION_NONOTIFY},
+                                       {ID2P(LANG_SOFTLOCK_DISABLE_ALL_NOTIFY), SEL_ACTION_ALLNONOTIFY}
                                             };
 
             mask = mask_select(mask, ID2P(LANG_SOFTLOCK_SELECTIVE)