RemoteControlClient

res/values/translatable.xml

@@ -129,10 +129,10 @@ THE SOFTWARE.
 
 	<string name="pref_output">Audio Output</string>
 	<string name="volume_title">Volume</string>
-	<string name="media_button_title">Use Headset Controls</string>
-	<string name="media_button_summary">Single click for play/pause. Double click for next.</string>
+	<string name="media_button_title">Headset/Bluetooth Controls</string>
+	<string name="media_button_summary">This is also required for ICS lockscreen controls.</string>
 	<string name="headset_only_title">External Output Only</string>
-	<string name="headset_only_summary">Only play music through an external output (e.g. headphones, Bluetooth)</string>
+	<string name="headset_only_summary">Prevents music from being played through the speakers.</string>
 	<string name="headset_pause_title">Pause When Unplugged</string>
 	<string name="headset_pause_summary">Pause when the headphones are unplugged.</string>
 	<string name="headset_play_title">Play When Plugged</string>

src/org/kreed/vanilla/CompatIcs.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2012 Christopher Eby <kreed@kreed.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.kreed.vanilla;
+
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.media.MediaMetadataRetriever;
+import android.media.RemoteControlClient;
+
+/**
+ * Framework methods only in ICS or above go here.
+ */
+public class CompatIcs {
+	/**
+	 * Used with updateRemote method.
+	 */
+	private static RemoteControlClient sRemote;
+
+	/**
+	 * Perform initialization required for RemoteControlClient.
+	 *
+	 * @param context A context to use.
+	 * @param am The AudioManager service.
+	 */
+	public static void registerRemote(Context context, AudioManager am)
+	{
+		if (!MediaButtonReceiver.useHeadsetControls(context)) {
+			// RemoteControlClient requires MEDIA_BUTTON intent
+			return;
+		}
+
+		MediaButtonReceiver.registerMediaButton(context);
+
+		Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
+		mediaButtonIntent.setComponent(new ComponentName(context.getPackageName(), MediaButtonReceiver.class.getName()));
+		PendingIntent mediaPendingIntent = PendingIntent.getBroadcast(context, 0, mediaButtonIntent, 0);
+		RemoteControlClient remote = new RemoteControlClient(mediaPendingIntent);
+		int flags = RemoteControlClient.FLAG_KEY_MEDIA_NEXT
+			| RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS
+			| RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE
+			| RemoteControlClient.FLAG_KEY_MEDIA_PLAY
+			| RemoteControlClient.FLAG_KEY_MEDIA_PAUSE;
+		remote.setTransportControlFlags(flags);
+		am.registerRemoteControlClient(remote);
+		sRemote = remote;
+	}
+
+	/**
+	 * Update the remote with new metadata.
+	 * {@link #registerRemote(Context, AudioManager)} must have been called
+	 * first.
+	 *
+	 * @param context A context to use.
+	 * @param song The song containing the new metadata.
+	 * @param state PlaybackService state, used to determine playback state.
+	 */
+	public static void updateRemote(Context context, Song song, int state)
+	{
+		RemoteControlClient remote = sRemote;
+		if (remote == null)
+			return;
+
+		remote.setPlaybackState((state & PlaybackService.FLAG_PLAYING) != 0 ? RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED);
+		RemoteControlClient.MetadataEditor editor = remote.editMetadata(true);
+		if (song != null) {
+			editor.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, song.artist);
+			editor.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, song.album);
+			editor.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, song.title);
+			editor.putBitmap(RemoteControlClient.MetadataEditor.BITMAP_KEY_ARTWORK, song.getCover(context));
+		}
+		editor.apply();
+	}
+}

src/org/kreed/vanilla/MediaButtonReceiver.java

@@ -153,6 +153,14 @@ public class MediaButtonReceiver extends BroadcastReceiver {
 			if (action == KeyEvent.ACTION_DOWN)
 				act = PlaybackService.ACTION_PREVIOUS_SONG_AUTOPLAY;
 			break;
+		case KeyEvent.KEYCODE_MEDIA_PLAY:
+			if (action == KeyEvent.ACTION_DOWN)
+				act = PlaybackService.ACTION_PLAY;
+			break;
+		case KeyEvent.KEYCODE_MEDIA_PAUSE:
+			if (action == KeyEvent.ACTION_DOWN)
+				act = PlaybackService.ACTION_PAUSE;
+			break;
 		default:
 			return false;
 		}

src/org/kreed/vanilla/PlaybackService.java

@@ -364,6 +364,10 @@ public final class PlaybackService extends Service
 
 		getContentResolver().registerContentObserver(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, true, mObserver);
 
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+			CompatIcs.registerRemote(this, mAudioManager);
+		}
+
 		mLooper = thread.getLooper();
 		mHandler = new Handler(mLooper, this);
 
@@ -631,6 +635,10 @@ public final class PlaybackService extends Service
 
 		updateWidgets();
 
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+			CompatIcs.updateRemote(this, mCurrentSong, mState);
+		}
+
 		if (mStockBroadcast)
 			stockMusicBroadcast();
 		if (mScrobble)