summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2022-01-13 11:40:35 +0000
committerAidan MacDonald <amachronic@protonmail.com>2022-01-16 23:58:30 +0000
commit0fbaeed250fde8ad11cb9dbe8cc63667d269b5d2 (patch)
treeafce42827a2f87fb6ae27ef2d77968f43957045e
parentc62c323ebc71da33bf653624e45becee096906c3 (diff)
downloadrockbox-0fbaeed250fde8ad11cb9dbe8cc63667d269b5d2.tar.gz
rockbox-0fbaeed250fde8ad11cb9dbe8cc63667d269b5d2.zip
Remove ACTION_SETTINGS_RESET
This action has never been used since its introduction in 2006. There's no real need for it, as it's possible to reset settings from the context menu. Change-Id: I6b357ad1a2e19a9b631ee3055e158492570479e3
-rw-r--r--apps/action.h1
-rw-r--r--apps/keymaps/keymap-agptekrocker.c1
-rw-r--r--apps/keymaps/keymap-c200.c1
-rw-r--r--apps/keymaps/keymap-clip.c1
-rw-r--r--apps/keymaps/keymap-creativezv.c2
-rw-r--r--apps/keymaps/keymap-creativezvm.c2
-rw-r--r--apps/keymaps/keymap-e200.c1
-rw-r--r--apps/keymaps/keymap-erosq.c1
-rw-r--r--apps/keymaps/keymap-fiiom3k.c1
-rw-r--r--apps/keymaps/keymap-fiiom3klinux.c1
-rw-r--r--apps/keymaps/keymap-fuze.c1
-rw-r--r--apps/keymaps/keymap-fuzeplus.c1
-rw-r--r--apps/keymaps/keymap-gigabeat-s.c2
-rw-r--r--apps/keymaps/keymap-gigabeat.c2
-rw-r--r--apps/keymaps/keymap-h10.c1
-rw-r--r--apps/keymaps/keymap-h1x0_h3x0.c2
-rw-r--r--apps/keymaps/keymap-hdd1630.c2
-rw-r--r--apps/keymaps/keymap-hdd6330.c2
-rw-r--r--apps/keymaps/keymap-hm60x.c1
-rw-r--r--apps/keymaps/keymap-hm801.c1
-rw-r--r--apps/keymaps/keymap-ihifi.c1
-rw-r--r--apps/keymaps/keymap-ihifi770.c1
-rw-r--r--apps/keymaps/keymap-ihifi800.c1
-rw-r--r--apps/keymaps/keymap-m200.c1
-rw-r--r--apps/keymaps/keymap-ma.c1
-rw-r--r--apps/keymaps/keymap-meizu-m6sl.c2
-rw-r--r--apps/keymaps/keymap-mini2440.c2
-rw-r--r--apps/keymaps/keymap-mr100.c2
-rw-r--r--apps/keymaps/keymap-mr500.c2
-rw-r--r--apps/keymaps/keymap-nwz.c1
-rw-r--r--apps/keymaps/keymap-nwza860.c2
-rw-r--r--apps/keymaps/keymap-sa9200.c1
-rw-r--r--apps/keymaps/keymap-touchscreen.c2
-rw-r--r--apps/keymaps/keymap-xduoox20.c1
-rw-r--r--apps/keymaps/keymap-xduoox3.c1
-rw-r--r--apps/keymaps/keymap-xduoox3ii.c1
-rw-r--r--apps/keymaps/keymap-yh8xx_yh9xx.c1
-rw-r--r--apps/keymaps/keymap-zen.c1
-rw-r--r--apps/keymaps/keymap-zenxfi3.c1
39 files changed, 0 insertions, 52 deletions
diff --git a/apps/action.h b/apps/action.h
index f94dd3086c..3217ce4d6f 100644
--- a/apps/action.h
+++ b/apps/action.h
@@ -245,7 +245,6 @@ enum {
245 ACTION_SETTINGS_DEC, 245 ACTION_SETTINGS_DEC,
246 ACTION_SETTINGS_DECREPEAT, 246 ACTION_SETTINGS_DECREPEAT,
247 ACTION_SETTINGS_DECBIGSTEP, 247 ACTION_SETTINGS_DECBIGSTEP,
248 ACTION_SETTINGS_RESET,
249 ACTION_SETTINGS_SET, /* Used by touchscreen targets */ 248 ACTION_SETTINGS_SET, /* Used by touchscreen targets */
250 249
251 /* bookmark screen */ 250 /* bookmark screen */
diff --git a/apps/keymaps/keymap-agptekrocker.c b/apps/keymaps/keymap-agptekrocker.c
index 4d7139ffd5..1fb8465b0a 100644
--- a/apps/keymaps/keymap-agptekrocker.c
+++ b/apps/keymaps/keymap-agptekrocker.c
@@ -96,7 +96,6 @@ static const struct button_mapping button_context_settings[] = {
96 { ACTION_SETTINGS_DEC, BUTTON_VOLDOWN, BUTTON_NONE }, 96 { ACTION_SETTINGS_DEC, BUTTON_VOLDOWN, BUTTON_NONE },
97 { ACTION_SETTINGS_DECREPEAT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, 97 { ACTION_SETTINGS_DECREPEAT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
98/* ACTION_SETTINGS_DECBIGSTEP */ 98/* ACTION_SETTINGS_DECBIGSTEP */
99 { ACTION_SETTINGS_RESET, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
100/* ACTION_SETTINGS_SET, Used by touchscreen targets */ 99/* ACTION_SETTINGS_SET, Used by touchscreen targets */
101 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 100 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
102}; /* button_context_settings */ 101}; /* button_context_settings */
diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c
index 2e26f424cc..6ca1702e5f 100644
--- a/apps/keymaps/keymap-c200.c
+++ b/apps/keymaps/keymap-c200.c
@@ -88,7 +88,6 @@ static const struct button_mapping button_context_wps[] = {
88 88
89static const struct button_mapping button_context_settings[] = { 89static const struct button_mapping button_context_settings[] = {
90 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, 90 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
91 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
92 91
93 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 92 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
94 { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 93 { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c
index 7c8fb69471..3c92f03a07 100644
--- a/apps/keymaps/keymap-clip.c
+++ b/apps/keymaps/keymap-clip.c
@@ -98,7 +98,6 @@ static const struct button_mapping button_context_wps[] = {
98static const struct button_mapping button_context_settings[] = { 98static const struct button_mapping button_context_settings[] = {
99 { ACTION_STD_OK, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, 99 { ACTION_STD_OK, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
100 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, 100 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
101 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
102 101
103 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 102 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
104 { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 103 { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-creativezv.c b/apps/keymaps/keymap-creativezv.c
index f2bcfd80f7..3242e8924f 100644
--- a/apps/keymaps/keymap-creativezv.c
+++ b/apps/keymaps/keymap-creativezv.c
@@ -134,7 +134,6 @@ static const struct button_mapping button_context_settings[] = {
134 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 134 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
135 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 135 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
136 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, 136 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
137 { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
138 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 137 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
139}; /* button_context_settings */ 138}; /* button_context_settings */
140 139
@@ -147,7 +146,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
147 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 146 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
148 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 147 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
149 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 148 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
150 { ACTION_SETTINGS_RESET, BUTTON_BACK, BUTTON_NONE },
151 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 149 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
152}; /* button_context_settingsgraphical */ 150}; /* button_context_settingsgraphical */
153 151
diff --git a/apps/keymaps/keymap-creativezvm.c b/apps/keymaps/keymap-creativezvm.c
index 7a0cb5965a..47b24bf8b3 100644
--- a/apps/keymaps/keymap-creativezvm.c
+++ b/apps/keymaps/keymap-creativezvm.c
@@ -133,7 +133,6 @@ static const struct button_mapping button_context_settings[] = {
133 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, 133 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
134 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 134 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
135 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, 135 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
136 { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
137 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 136 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
138}; /* button_context_settings */ 137}; /* button_context_settings */
139 138
@@ -146,7 +145,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
146 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 145 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
147 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 146 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
148 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 147 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
149 { ACTION_SETTINGS_RESET, BUTTON_BACK, BUTTON_NONE },
150 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 148 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
151}; /* button_context_settingsgraphical */ 149}; /* button_context_settingsgraphical */
152 150
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index 538cd7cb8a..20cc16f2dc 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -100,7 +100,6 @@ static const struct button_mapping button_context_settings[] = {
100 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 100 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
101 { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, 101 { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
102 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, 102 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
103 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
104 103
105 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 104 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
106}; /* button_context_settings */ 105}; /* button_context_settings */
diff --git a/apps/keymaps/keymap-erosq.c b/apps/keymaps/keymap-erosq.c
index d375ec0359..d486423a53 100644
--- a/apps/keymaps/keymap-erosq.c
+++ b/apps/keymaps/keymap-erosq.c
@@ -87,7 +87,6 @@ static const struct button_mapping button_context_settings[] = {
87 { ACTION_SETTINGS_INCBIGSTEP, BUTTON_VOL_UP, BUTTON_NONE }, 87 { ACTION_SETTINGS_INCBIGSTEP, BUTTON_VOL_UP, BUTTON_NONE },
88 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, 88 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE },
89 { ACTION_SETTINGS_DECBIGSTEP, BUTTON_VOL_DOWN, BUTTON_NONE }, 89 { ACTION_SETTINGS_DECBIGSTEP, BUTTON_VOL_DOWN, BUTTON_NONE },
90 { ACTION_SETTINGS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
91 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 90 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
92}; /* button_context_settings */ 91}; /* button_context_settings */
93 92
diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3k.c
index 749f25a35d..a97be0870d 100644
--- a/apps/keymaps/keymap-fiiom3k.c
+++ b/apps/keymaps/keymap-fiiom3k.c
@@ -131,7 +131,6 @@ static const struct button_mapping button_context_settings[] = {
131 {ACTION_SETTINGS_DEC, BUTTON_SCROLL_FWD, BUTTON_NONE}, 131 {ACTION_SETTINGS_DEC, BUTTON_SCROLL_FWD, BUTTON_NONE},
132 {ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, 132 {ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE},
133 {ACTION_SETTINGS_DECBIGSTEP, BUTTON_VOL_DOWN, BUTTON_NONE}, 133 {ACTION_SETTINGS_DECBIGSTEP, BUTTON_VOL_DOWN, BUTTON_NONE},
134 {ACTION_SETTINGS_RESET, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT},
135 {ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE}, 134 {ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE},
136 {ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, 135 {ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
137 {ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE}, 136 {ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE},
diff --git a/apps/keymaps/keymap-fiiom3klinux.c b/apps/keymaps/keymap-fiiom3klinux.c
index 7769e2da04..e404d8bfb0 100644
--- a/apps/keymaps/keymap-fiiom3klinux.c
+++ b/apps/keymaps/keymap-fiiom3klinux.c
@@ -150,7 +150,6 @@ static const struct button_mapping button_context_quickscreen[] = {
150 150
151/** Settings - General Mappings **/ 151/** Settings - General Mappings **/
152static const struct button_mapping button_context_settings[] = { 152static const struct button_mapping button_context_settings[] = {
153 { ACTION_SETTINGS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
154 { ACTION_STD_PREV, BUTTON_PREV, BUTTON_NONE }, 153 { ACTION_STD_PREV, BUTTON_PREV, BUTTON_NONE },
155 { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, 154 { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE },
156 { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, 155 { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-fuze.c b/apps/keymaps/keymap-fuze.c
index c5538a6c49..ef0bed1099 100644
--- a/apps/keymaps/keymap-fuze.c
+++ b/apps/keymaps/keymap-fuze.c
@@ -99,7 +99,6 @@ static const struct button_mapping button_context_settings[] = {
99 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 99 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
100 { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, 100 { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
101 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, 101 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
102 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
103 102
104 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 103 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
105}; /* button_context_settings */ 104}; /* button_context_settings */
diff --git a/apps/keymaps/keymap-fuzeplus.c b/apps/keymaps/keymap-fuzeplus.c
index 0933916b4a..6601316469 100644
--- a/apps/keymaps/keymap-fuzeplus.c
+++ b/apps/keymaps/keymap-fuzeplus.c
@@ -225,7 +225,6 @@ static const struct button_mapping button_context_settings[] = {
225 { ACTION_SETTINGS_DECBIGSTEP, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_NONE }, 225 { ACTION_SETTINGS_DECBIGSTEP, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_NONE },
226 226
227 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 227 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
228 { ACTION_SETTINGS_RESET, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
229 228
230 { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE }, 229 { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE },
231 230
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c
index 4cd76184ff..35cecb7476 100644
--- a/apps/keymaps/keymap-gigabeat-s.c
+++ b/apps/keymaps/keymap-gigabeat-s.c
@@ -167,7 +167,6 @@ static const struct button_mapping button_context_settings[] = {
167 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 167 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
168 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 168 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
169 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 169 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
170 { ACTION_SETTINGS_RESET, BUTTON_BACK, BUTTON_NONE },
171 170
172 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 171 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
173}; /* button_context_settings */ 172}; /* button_context_settings */
@@ -181,7 +180,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
181 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 180 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
182 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 181 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
183 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 182 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
184 { ACTION_SETTINGS_RESET, BUTTON_BACK, BUTTON_NONE },
185 183
186 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 184 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
187}; /* button_context_settingsgraphical */ 185}; /* button_context_settingsgraphical */
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index 31fd0eaf0d..913763af18 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -160,7 +160,6 @@ static const struct button_mapping button_context_settings[] = {
160 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 160 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
161 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 161 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
162 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 162 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
163 { ACTION_SETTINGS_RESET, BUTTON_A, BUTTON_NONE },
164 163
165 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 164 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
166}; /* button_context_settings */ 165}; /* button_context_settings */
@@ -174,7 +173,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
174 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 173 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
175 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 174 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
176 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 175 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
177 { ACTION_SETTINGS_RESET, BUTTON_A, BUTTON_NONE },
178 176
179 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 177 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
180}; /* button_context_settingsgraphical */ 178}; /* button_context_settingsgraphical */
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index 825590e6f4..7df2b61d05 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -124,7 +124,6 @@ static const struct button_mapping button_context_settings[] = {
124 { ACTION_STD_PREVREPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE }, 124 { ACTION_STD_PREVREPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE },
125 { ACTION_STD_NEXT, BUTTON_REW, BUTTON_NONE }, 125 { ACTION_STD_NEXT, BUTTON_REW, BUTTON_NONE },
126 { ACTION_STD_NEXTREPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, 126 { ACTION_STD_NEXTREPEAT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE },
127 { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
128 127
129 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 128 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
130}; /* button_context_settings */ 129}; /* button_context_settings */
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index d4f098ce1e..422af7502c 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -145,7 +145,6 @@ static const struct button_mapping button_context_settings[] = {
145 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 145 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
146 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 146 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
147 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 147 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
148 { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE },
149 148
150 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 149 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
151}; /* button_context_settings */ 150}; /* button_context_settings */
@@ -159,7 +158,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
159 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 158 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
160 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 159 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
161 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 160 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
162 { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE },
163 161
164 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 162 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
165}; /* button_context_settingsgraphical */ 163}; /* button_context_settingsgraphical */
diff --git a/apps/keymaps/keymap-hdd1630.c b/apps/keymaps/keymap-hdd1630.c
index ca55f7fc26..7afcaeec6d 100644
--- a/apps/keymaps/keymap-hdd1630.c
+++ b/apps/keymaps/keymap-hdd1630.c
@@ -160,7 +160,6 @@ static const struct button_mapping button_context_settings[] = {
160 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 160 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
161 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 161 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
162 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 162 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
163 { ACTION_SETTINGS_RESET, BUTTON_VIEW, BUTTON_NONE },
164 163
165 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 164 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
166}; /* button_context_settings */ 165}; /* button_context_settings */
@@ -174,7 +173,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
174 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 173 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
175 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 174 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
176 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 175 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
177 { ACTION_SETTINGS_RESET, BUTTON_VIEW, BUTTON_NONE },
178 176
179 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 177 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
180}; /* button_context_settingsgraphical */ 178}; /* button_context_settingsgraphical */
diff --git a/apps/keymaps/keymap-hdd6330.c b/apps/keymaps/keymap-hdd6330.c
index ed197af41c..18ef2b7c8f 100644
--- a/apps/keymaps/keymap-hdd6330.c
+++ b/apps/keymaps/keymap-hdd6330.c
@@ -142,7 +142,6 @@ static const struct button_mapping button_context_settings[] = {
142 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 142 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
143 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 143 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
144 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 144 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
145 { ACTION_SETTINGS_RESET, BUTTON_VIEW, BUTTON_NONE },
146 145
147 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 146 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
148}; /* button_context_settings */ 147}; /* button_context_settings */
@@ -156,7 +155,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
156 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 155 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
157 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 156 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
158 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 157 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
159 { ACTION_SETTINGS_RESET, BUTTON_VIEW, BUTTON_NONE },
160 158
161 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 159 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
162}; /* button_context_settingsgraphical */ 160}; /* button_context_settingsgraphical */
diff --git a/apps/keymaps/keymap-hm60x.c b/apps/keymaps/keymap-hm60x.c
index 2e1f3dd516..fa8783de6d 100644
--- a/apps/keymaps/keymap-hm60x.c
+++ b/apps/keymaps/keymap-hm60x.c
@@ -128,7 +128,6 @@ static const struct button_mapping button_context_quickscreen[] = {
128 128
129/** Settings - General Mappings **/ 129/** Settings - General Mappings **/
130static const struct button_mapping button_context_settings[] = { 130static const struct button_mapping button_context_settings[] = {
131 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
132 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 131 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
133 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 132 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
134 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, 133 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-hm801.c b/apps/keymaps/keymap-hm801.c
index 1f0a49c90c..210f521178 100644
--- a/apps/keymaps/keymap-hm801.c
+++ b/apps/keymaps/keymap-hm801.c
@@ -154,7 +154,6 @@ static const struct button_mapping button_context_quickscreen[] = {
154/** Settings - General Mappings **/ 154/** Settings - General Mappings **/
155static const struct button_mapping button_context_settings[] = { 155static const struct button_mapping button_context_settings[] = {
156 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, 156 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER},
157 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
158 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 157 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
159 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 158 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
160 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, 159 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-ihifi.c b/apps/keymaps/keymap-ihifi.c
index 147c2f5f62..0c28f812f1 100644
--- a/apps/keymaps/keymap-ihifi.c
+++ b/apps/keymaps/keymap-ihifi.c
@@ -127,7 +127,6 @@ static const struct button_mapping button_context_quickscreen[] = {
127 127
128/** Settings - General Mappings **/ 128/** Settings - General Mappings **/
129static const struct button_mapping button_context_settings[] = { 129static const struct button_mapping button_context_settings[] = {
130 { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
131 { ACTION_SETTINGS_INC, BUTTON_BWD, BUTTON_NONE }, 130 { ACTION_SETTINGS_INC, BUTTON_BWD, BUTTON_NONE },
132 { ACTION_SETTINGS_INCREPEAT, BUTTON_BWD|BUTTON_REPEAT, BUTTON_NONE }, 131 { ACTION_SETTINGS_INCREPEAT, BUTTON_BWD|BUTTON_REPEAT, BUTTON_NONE },
133 { ACTION_SETTINGS_DEC, BUTTON_FWD, BUTTON_NONE }, 132 { ACTION_SETTINGS_DEC, BUTTON_FWD, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-ihifi770.c b/apps/keymaps/keymap-ihifi770.c
index c5671bd650..a5f37cdb7d 100644
--- a/apps/keymaps/keymap-ihifi770.c
+++ b/apps/keymaps/keymap-ihifi770.c
@@ -139,7 +139,6 @@ static const struct button_mapping button_context_settings[] = {
139 { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, 139 { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE },
140 { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, 140 { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE },
141 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 141 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
142 { ACTION_SETTINGS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
143 142
144 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 143 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
145}; /* button_context_settings */ 144}; /* button_context_settings */
diff --git a/apps/keymaps/keymap-ihifi800.c b/apps/keymaps/keymap-ihifi800.c
index b56bd018eb..4dfceff965 100644
--- a/apps/keymaps/keymap-ihifi800.c
+++ b/apps/keymaps/keymap-ihifi800.c
@@ -143,7 +143,6 @@ static const struct button_mapping button_context_settings[] = {
143 { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, 143 { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE },
144 { ACTION_STD_OK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, 144 { ACTION_STD_OK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
145 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 145 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
146 { ACTION_SETTINGS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
147 146
148 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 147 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
149}; /* button_context_settings */ 148}; /* button_context_settings */
diff --git a/apps/keymaps/keymap-m200.c b/apps/keymaps/keymap-m200.c
index f055d648ef..be202d21e6 100644
--- a/apps/keymaps/keymap-m200.c
+++ b/apps/keymaps/keymap-m200.c
@@ -89,7 +89,6 @@ static const struct button_mapping button_context_wps[] = {
89 89
90static const struct button_mapping button_context_settings[] = { 90static const struct button_mapping button_context_settings[] = {
91 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, 91 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
92 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
93 92
94 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 93 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
95 { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 94 { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-ma.c b/apps/keymaps/keymap-ma.c
index 28220d9f50..aaf7df0c01 100644
--- a/apps/keymaps/keymap-ma.c
+++ b/apps/keymaps/keymap-ma.c
@@ -135,7 +135,6 @@ static const struct button_mapping button_context_quickscreen[] = {
135 135
136/** Settings - General Mappings **/ 136/** Settings - General Mappings **/
137static const struct button_mapping button_context_settings[] = { 137static const struct button_mapping button_context_settings[] = {
138 { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
139 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 138 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
140 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 139 { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
141 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, 140 { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-meizu-m6sl.c b/apps/keymaps/keymap-meizu-m6sl.c
index 35e44da905..31dbc88432 100644
--- a/apps/keymaps/keymap-meizu-m6sl.c
+++ b/apps/keymaps/keymap-meizu-m6sl.c
@@ -147,7 +147,6 @@ static const struct button_mapping button_context_settings[] = {
147 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 147 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
148 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 148 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
149 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 149 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
150 { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
151 150
152 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 151 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
153}; /* button_context_settings */ 152}; /* button_context_settings */
@@ -161,7 +160,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
161 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 160 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
162 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 161 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
163 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 162 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
164 { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
165 163
166 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 164 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
167}; /* button_context_settingsgraphical */ 165}; /* button_context_settingsgraphical */
diff --git a/apps/keymaps/keymap-mini2440.c b/apps/keymaps/keymap-mini2440.c
index 70f63aef72..3fe0698fa0 100644
--- a/apps/keymaps/keymap-mini2440.c
+++ b/apps/keymaps/keymap-mini2440.c
@@ -162,7 +162,6 @@ static const struct button_mapping button_context_settings[] = {
162 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 162 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
163 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 163 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
164 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 164 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
165 { ACTION_SETTINGS_RESET, BUTTON_A, BUTTON_NONE },
166 165
167 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 166 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
168}; /* button_context_settings */ 167}; /* button_context_settings */
@@ -176,7 +175,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
176 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 175 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
177 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 176 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
178 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 177 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
179 { ACTION_SETTINGS_RESET, BUTTON_A, BUTTON_NONE },
180 178
181 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 179 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
182}; /* button_context_settingsgraphical */ 180}; /* button_context_settingsgraphical */
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c
index d551d434be..0a677efc00 100644
--- a/apps/keymaps/keymap-mr100.c
+++ b/apps/keymaps/keymap-mr100.c
@@ -153,7 +153,6 @@ static const struct button_mapping button_context_settings[] = {
153 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 153 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
154 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 154 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
155 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 155 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
156 { ACTION_SETTINGS_RESET, BUTTON_DISPLAY, BUTTON_NONE },
157 156
158 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 157 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
159}; /* button_context_settings */ 158}; /* button_context_settings */
@@ -167,7 +166,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
167 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 166 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
168 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, 167 { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
169 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 168 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
170 { ACTION_SETTINGS_RESET, BUTTON_DISPLAY, BUTTON_NONE },
171 169
172 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 170 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
173}; /* button_context_settingsgraphical */ 171}; /* button_context_settingsgraphical */
diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c
index b35c9c1dfc..41e6d21827 100644
--- a/apps/keymaps/keymap-mr500.c
+++ b/apps/keymaps/keymap-mr500.c
@@ -118,7 +118,6 @@ static const struct button_mapping button_context_settings[] = {
118 { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, 118 { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
119 { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, 119 { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE },
120 { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, 120 { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
121 { ACTION_SETTINGS_RESET, BUTTON_RC_MODE, BUTTON_NONE },
122 121
123 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 122 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
124}; /* button_context_settings */ 123}; /* button_context_settings */
@@ -132,7 +131,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
132 { ACTION_STD_PREVREPEAT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, 131 { ACTION_STD_PREVREPEAT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE },
133 { ACTION_STD_NEXT, BUTTON_RC_DOWN, BUTTON_NONE }, 132 { ACTION_STD_NEXT, BUTTON_RC_DOWN, BUTTON_NONE },
134 { ACTION_STD_NEXTREPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 133 { ACTION_STD_NEXTREPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE },
135 { ACTION_SETTINGS_RESET, BUTTON_RC_MODE, BUTTON_NONE },
136 134
137 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 135 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
138}; /* button_context_settingsgraphical */ 136}; /* button_context_settingsgraphical */
diff --git a/apps/keymaps/keymap-nwz.c b/apps/keymaps/keymap-nwz.c
index 66bdd1b0db..028fbf1bfd 100644
--- a/apps/keymaps/keymap-nwz.c
+++ b/apps/keymaps/keymap-nwz.c
@@ -199,7 +199,6 @@ static const struct button_mapping button_context_settings[] = {
199 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 199 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
200 200
201 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 201 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
202 { ACTION_SETTINGS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
203 202
204 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 203 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
205}; /* button_context_settings */ 204}; /* button_context_settings */
diff --git a/apps/keymaps/keymap-nwza860.c b/apps/keymaps/keymap-nwza860.c
index f1a3bb6f85..d455e23b62 100644
--- a/apps/keymaps/keymap-nwza860.c
+++ b/apps/keymaps/keymap-nwza860.c
@@ -125,8 +125,6 @@ static const struct button_mapping button_context_settings[] = {
125 { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, 125 { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE },
126 { ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 126 { ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
127 127
128 { ACTION_SETTINGS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
129
130 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 128 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
131}; /* button_context_settings */ 129}; /* button_context_settings */
132 130
diff --git a/apps/keymaps/keymap-sa9200.c b/apps/keymaps/keymap-sa9200.c
index d29557e222..2dcf301f0f 100644
--- a/apps/keymaps/keymap-sa9200.c
+++ b/apps/keymaps/keymap-sa9200.c
@@ -155,7 +155,6 @@ static const struct button_mapping button_context_listtree_scroll_without_combo[
155 155
156static const struct button_mapping button_context_settings[] = { 156static const struct button_mapping button_context_settings[] = {
157 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, 157 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
158 { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE },
159 158
160 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, 159 { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE },
161 { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 160 { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c
index c70aea2651..555cf42f79 100644
--- a/apps/keymaps/keymap-touchscreen.c
+++ b/apps/keymaps/keymap-touchscreen.c
@@ -146,7 +146,6 @@ static const struct button_mapping button_context_settings[] = {
146 { ACTION_SETTINGS_INCREPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, 146 { ACTION_SETTINGS_INCREPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE },
147 { ACTION_SETTINGS_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE }, 147 { ACTION_SETTINGS_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE },
148 { ACTION_SETTINGS_DECREPEAT, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, 148 { ACTION_SETTINGS_DECREPEAT, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE },
149 { ACTION_SETTINGS_RESET, BUTTON_CENTER, BUTTON_NONE },
150 149
151 { ACTION_STD_PREV, BUTTON_MIDLEFT, BUTTON_NONE }, 150 { ACTION_STD_PREV, BUTTON_MIDLEFT, BUTTON_NONE },
152 { ACTION_STD_PREVREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, 151 { ACTION_STD_PREVREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE },
@@ -164,7 +163,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
164 { ACTION_SETTINGS_INCREPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, 163 { ACTION_SETTINGS_INCREPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE },
165 { ACTION_SETTINGS_DEC, BUTTON_MIDLEFT, BUTTON_NONE }, 164 { ACTION_SETTINGS_DEC, BUTTON_MIDLEFT, BUTTON_NONE },
166 { ACTION_SETTINGS_DECREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, 165 { ACTION_SETTINGS_DECREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE },
167 { ACTION_SETTINGS_RESET, BUTTON_CENTER, BUTTON_NONE },
168 166
169 { ACTION_STD_CANCEL, BUTTON_TOPLEFT, BUTTON_NONE }, 167 { ACTION_STD_CANCEL, BUTTON_TOPLEFT, BUTTON_NONE },
170 168
diff --git a/apps/keymaps/keymap-xduoox20.c b/apps/keymaps/keymap-xduoox20.c
index c49410cd03..b08db90cfd 100644
--- a/apps/keymaps/keymap-xduoox20.c
+++ b/apps/keymaps/keymap-xduoox20.c
@@ -145,7 +145,6 @@ static const struct button_mapping button_context_quickscreen[] = {
145 145
146/** Settings - General Mappings **/ 146/** Settings - General Mappings **/
147static const struct button_mapping button_context_settings[] = { 147static const struct button_mapping button_context_settings[] = {
148 { ACTION_SETTINGS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
149 { ACTION_STD_PREV, BUTTON_NEXT, BUTTON_NONE }, 148 { ACTION_STD_PREV, BUTTON_NEXT, BUTTON_NONE },
150 { ACTION_STD_PREVREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, 149 { ACTION_STD_PREVREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE },
151 { ACTION_STD_NEXT, BUTTON_PREV, BUTTON_NONE }, 150 { ACTION_STD_NEXT, BUTTON_PREV, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-xduoox3.c b/apps/keymaps/keymap-xduoox3.c
index 124ca06c9d..bbe4c88772 100644
--- a/apps/keymaps/keymap-xduoox3.c
+++ b/apps/keymaps/keymap-xduoox3.c
@@ -172,7 +172,6 @@ static const struct button_mapping button_context_quickscreen[] = {
172 172
173/** Settings - General Mappings **/ 173/** Settings - General Mappings **/
174static const struct button_mapping button_context_settings[] = { 174static const struct button_mapping button_context_settings[] = {
175 { ACTION_SETTINGS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
176 { ACTION_STD_PREV, BUTTON_PREV, BUTTON_NONE }, 175 { ACTION_STD_PREV, BUTTON_PREV, BUTTON_NONE },
177 { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, 176 { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE },
178 { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, 177 { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-xduoox3ii.c b/apps/keymaps/keymap-xduoox3ii.c
index c8be8ce13e..d99c8240a1 100644
--- a/apps/keymaps/keymap-xduoox3ii.c
+++ b/apps/keymaps/keymap-xduoox3ii.c
@@ -145,7 +145,6 @@ static const struct button_mapping button_context_quickscreen[] = {
145 145
146/** Settings - General Mappings **/ 146/** Settings - General Mappings **/
147static const struct button_mapping button_context_settings[] = { 147static const struct button_mapping button_context_settings[] = {
148 { ACTION_SETTINGS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
149 { ACTION_STD_PREV, BUTTON_NEXT, BUTTON_NONE }, 148 { ACTION_STD_PREV, BUTTON_NEXT, BUTTON_NONE },
150 { ACTION_STD_PREVREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, 149 { ACTION_STD_PREVREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE },
151 { ACTION_STD_NEXT, BUTTON_PREV, BUTTON_NONE }, 150 { ACTION_STD_NEXT, BUTTON_PREV, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c
index 32623e1a72..9332c9fe98 100644
--- a/apps/keymaps/keymap-yh8xx_yh9xx.c
+++ b/apps/keymaps/keymap-yh8xx_yh9xx.c
@@ -201,7 +201,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = {
201 { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 201 { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
202 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, 202 { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
203 { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 203 { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
204 { ACTION_SETTINGS_RESET, BUTTON_REW|BUTTON_REL, BUTTON_REW },
205 204
206 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, 205 { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE },
207 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 206 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-zen.c b/apps/keymaps/keymap-zen.c
index ab0f32edb4..b0f24af459 100644
--- a/apps/keymaps/keymap-zen.c
+++ b/apps/keymaps/keymap-zen.c
@@ -235,7 +235,6 @@ static const struct button_mapping button_context_settings[] = {
235 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 235 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
236 236
237 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 237 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
238 { ACTION_SETTINGS_RESET, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
239 238
240 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 239 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
241}; /* button_context_settings */ 240}; /* button_context_settings */
diff --git a/apps/keymaps/keymap-zenxfi3.c b/apps/keymaps/keymap-zenxfi3.c
index 191b36a1ca..d19a407b78 100644
--- a/apps/keymaps/keymap-zenxfi3.c
+++ b/apps/keymaps/keymap-zenxfi3.c
@@ -163,7 +163,6 @@ static const struct button_mapping button_context_settings[] = {
163 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 163 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
164 164
165 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 165 { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
166 { ACTION_SETTINGS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
167 166
168 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 167 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
169}; /* button_context_settings */ 168}; /* button_context_settings */