erosq: Move ACTION_TREE_WPS to list context for use in Files and Database

The ACTION_TREE_WPS (held back button) was a part of the mainmenu context, moved to list context so it would work in Files and Database as well for consistency.

Change-Id: I3749d7b4fd041db80e81c1a79d30c2c7bdd64829
This commit is contained in:
Dana Conrad 2021-03-16 21:06:15 -05:00 committed by Solomon Peachy
parent 25c9f716ce
commit e049099165

View file

@ -54,9 +54,6 @@ static const struct button_mapping button_context_standard[] = {
}; /* button_context_standard */ }; /* button_context_standard */
static const struct button_mapping button_context_mainmenu[] = { static const struct button_mapping button_context_mainmenu[] = {
{ ACTION_TREE_WPS, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, // settings menu is mainmenu context,
// so if we don't use repeat it will
// jump back to main menu root
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE), LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE),
}; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */ }; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */
@ -105,6 +102,7 @@ static const struct button_mapping button_context_list[] = {
/* ACTION_LISTTREE_PGUP, optional /* ACTION_LISTTREE_PGUP, optional
* ACTION_LISTTREE_PGDOWN, optional * ACTION_LISTTREE_PGDOWN, optional
*/ */
{ ACTION_TREE_WPS, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, // back returns to WPS from many contexts
#ifdef HAVE_VOLUME_IN_LIST #ifdef HAVE_VOLUME_IN_LIST
{ ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, { ACTION_LIST_VOLUP, BUTTON_VOL_UP, BUTTON_NONE },