Add support multimedia keys/buttons to the core, and adapt Rockbox on android for it (multimedia buttons are found on wired headsets and the lock screen in cyanogenmod).

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

1 files changed, 7 insertions, 7 deletions

diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index a5fe304..7d633ad 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -1045,18 +1045,18 @@ long gui_wps_show(void)
                 exit = true;
                 break;
 #endif
-            case SYS_POWEROFF:
-                default_event_handler(SYS_POWEROFF);
-                break;
             case ACTION_WPS_VIEW_PLAYLIST:
                 gwps_leave_wps();
                 return GO_TO_PLAYLIST_VIEWER;
                 break;
             default:
-                if(default_event_handler(button) == SYS_USB_CONNECTED)
-                {
-                    gwps_leave_wps();
-                    return GO_TO_ROOT;
+                switch(default_event_handler(button))
+                {   /* music has been stopped by the default handler */
+                    case SYS_USB_CONNECTED:
+                    case SYS_CALL_INCOMING:
+                    case BUTTON_MULTIMEDIA_STOP:
+                        gwps_leave_wps();
+                        return GO_TO_ROOT;
                 }
                 update = true;
                 break;