From aac448f5f76361e6ea2aea4c5928777abb3c029d Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sun, 21 Mar 2010 21:13:57 -0500
Subject: [PATCH] Add icons to the menu, change the order and rename "media
 library" to "choose songs"

---
 res/values/strings.xml                          |  2 +-
 src/org/kreed/vanilla/FullPlaybackActivity.java | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e9b3f12b..b40ce0f4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10,7 +10,7 @@
 	<string name="play">Play</string>
 	<string name="expand">Expand</string>
 	<string name="settings">Preferences</string>
-	<string name="library">Media Library</string>
+	<string name="library">Choose Songs</string>
 	<string name="quit">Stop and Exit</string>
 
 	<string name="enqueued">Enqueued %s</string>
diff --git a/src/org/kreed/vanilla/FullPlaybackActivity.java b/src/org/kreed/vanilla/FullPlaybackActivity.java
index 4a26f7d0..374de2ce 100644
--- a/src/org/kreed/vanilla/FullPlaybackActivity.java
+++ b/src/org/kreed/vanilla/FullPlaybackActivity.java
@@ -173,9 +173,9 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu)
 	{
-		menu.add(0, MENU_PREFS, 0, R.string.settings);
-		menu.add(0, MENU_LIBRARY, 0, R.string.library);
-		menu.add(0, MENU_QUIT, 0, R.string.quit);
+		menu.add(0, MENU_LIBRARY, 0, R.string.library).setIcon(android.R.drawable.ic_menu_add);
+		menu.add(0, MENU_PREFS, 0, R.string.settings).setIcon(android.R.drawable.ic_menu_preferences);
+		menu.add(0, MENU_QUIT, 0, R.string.quit).setIcon(android.R.drawable.ic_menu_close_clear_cancel);
 		return true;
 	}
 
@@ -251,7 +251,7 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli
 	{
 		if (mControlsTop.getVisibility() != View.VISIBLE)
 			return;
-		
+
 		int position = 0;
 		if (mService != null) {
 			try {
@@ -263,7 +263,7 @@ public class FullPlaybackActivity extends PlaybackActivity implements View.OnCli
 		if (!mSeekBarTracking)
 			mSeekBar.setProgress(mDuration == 0 ? 0 : (int)(1000 * position / mDuration));
 		mSeekText.setText(stringForTime((int)position) + " / " + stringForTime(mDuration));
-		
+
 		long next = 1000 - position % 1000;
 		mHandler.removeMessages(UPDATE_PROGRESS);
 		mHandler.sendEmptyMessageDelayed(UPDATE_PROGRESS, next);