am d04e2557: Merge change I9e4ded20 into eclair

Merge commit 'd04e2557d23686f506335e3bbe3e55ffbdcba9a4' into eclair-plus-aosp

* commit 'd04e2557d23686f506335e3bbe3e55ffbdcba9a4':
  Make headset buttons behave more like the in-app buttons, by seeking

diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 23a603b..c26046a 100644 (file)
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -575,7 +575,12 @@ public class MediaPlaybackService extends Service {
             if (CMDNEXT.equals(cmd) || NEXT_ACTION.equals(action)) {
                 next(true);
             } else if (CMDPREVIOUS.equals(cmd) || PREVIOUS_ACTION.equals(action)) {
-                prev();
+                if (position() < 2000) {
+                    prev();
+                } else {
+                    seek(0);
+                    play();
+                }
             } else if (CMDTOGGLEPAUSE.equals(cmd) || TOGGLEPAUSE_ACTION.equals(action)) {
                 if (isPlaying()) {
                     pause();