D2: Move ACTION_WPS_STOP from the power button as it's too easy to hit by accident when disengaging the hold switch. Use a long press of the top-right touchscreen area instead.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22594 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 1 insertions, 2 deletions

diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c
index fcb4d19c8e..0ec65484fc 100644
--- a/apps/keymaps/keymap-cowond2.c
+++ b/apps/keymaps/keymap-cowond2.c
@@ -63,8 +63,6 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,          BUTTON_MENU },
     { ACTION_WPS_CONTEXT,       BUTTON_MENU|BUTTON_REPEAT,       BUTTON_MENU },
     
-    { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,         BUTTON_POWER },
-    
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
 
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c
index dfa4fde39c..eda92373d9 100644
--- a/apps/keymaps/keymap-touchscreen.c
+++ b/apps/keymaps/keymap-touchscreen.c
@@ -72,6 +72,7 @@ static const struct button_mapping button_context_standard[]  = {
 static const struct button_mapping button_context_wps[]  = {
     
     { ACTION_WPS_PLAY,        BUTTON_TOPRIGHT|BUTTON_REL,        BUTTON_TOPRIGHT },
+    { ACTION_WPS_STOP,        BUTTON_TOPRIGHT|BUTTON_REPEAT,     BUTTON_TOPRIGHT },
     { ACTION_WPS_SKIPNEXT,    BUTTON_MIDRIGHT|BUTTON_REL,        BUTTON_MIDRIGHT },
     { ACTION_WPS_SKIPPREV,    BUTTON_MIDLEFT|BUTTON_REL,         BUTTON_MIDLEFT },