From ac952a64f24097e8d525391d403ca1c780128349 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Mon, 5 Apr 2010 22:01:14 -0500
Subject: [PATCH] Make the double click functionality of the media control
 actions optional

---
 src/org/kreed/vanilla/OneCellWidget.java   |  2 ++
 src/org/kreed/vanilla/PlaybackService.java | 42 ++++++++++++++--------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/org/kreed/vanilla/OneCellWidget.java b/src/org/kreed/vanilla/OneCellWidget.java
index 6a3e0914..11aaada7 100644
--- a/src/org/kreed/vanilla/OneCellWidget.java
+++ b/src/org/kreed/vanilla/OneCellWidget.java
@@ -65,9 +65,11 @@ public class OneCellWidget extends AppWidgetProvider {
 
 		views.setImageViewResource(R.id.play_pause, playing ? R.drawable.hidden_pause : R.drawable.hidden_play);
 		Intent playPause = new Intent(context, PlaybackService.class);
+		playPause.putExtra("double", true);
 		playPause.setAction(PlaybackService.TOGGLE_PLAYBACK);
 		views.setOnClickPendingIntent(R.id.play_pause, PendingIntent.getService(context, 0, playPause, 0));
 		Intent next = new Intent(context, PlaybackService.class);
+		next.putExtra("double", true);
 		next.setAction(PlaybackService.NEXT_SONG);
 		views.setOnClickPendingIntent(R.id.next, PendingIntent.getService(context, 0, next, 0));
 
diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index 6faa405b..2496bbbd 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -110,35 +110,47 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 		new Thread(this).start();
 	}
 
-	private void go(int delta)
+	private void go(Intent intent)
 	{
+		String action = intent.getAction();
+		int delta = 0;
+
+		if (TOGGLE_PLAYBACK.equals(action))
+			delta = 0;
+		else if (NEXT_SONG.equals(action))
+			delta = 1;
+		else
+			return;
+
 		if (mHandler == null) {
 			Toast.makeText(this, R.string.starting, Toast.LENGTH_SHORT).show();
 			mPendingGo = delta;
 			return;
 		}
 
-		if (mHandler.hasMessages(GO)) {
-			mHandler.removeMessages(GO);
-			Intent launcher = new Intent(this, FullPlaybackActivity.class);
-			launcher.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-			startActivity(launcher);
+		// check for double click
+		if (intent.hasExtra("double")) {
+			if (mHandler.hasMessages(GO)) {
+				mHandler.removeMessages(GO);
+				Intent launcher = new Intent(this, FullPlaybackActivity.class);
+				launcher.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+				startActivity(launcher);
+			} else {
+				mHandler.sendMessageDelayed(mHandler.obtainMessage(GO, delta, 0), 400);
+			}
 		} else {
-			mHandler.sendMessageDelayed(mHandler.obtainMessage(GO, delta, 0), 400);
+			if (delta == 0)
+				toggleFlag(FLAG_PLAYING);
+			else
+				setCurrentSong(delta);
 		}
 	}
 
 	@Override
 	public void onStart(Intent intent, int flags)
 	{
-		if (intent != null) {
-			String action = intent.getAction();
-
-			if (TOGGLE_PLAYBACK.equals(action))
-				go(0);
-			else if (NEXT_SONG.equals(action))
-				go(1);
-		}
+		if (intent != null)
+			go(intent);
 
 		if (mHandler != null)
 			mHandler.sendMessage(mHandler.obtainMessage(DO_ITEM, intent));