From 5620d240b523f96fe5d7f81a80cb1deef69a6d35 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Fri, 23 Sep 2011 02:23:24 -0500
Subject: [PATCH] Add a default album art icon for the library controls

Mostly to prevent the need to shift the postion of the buttons back and forth
when changing between songs with/without cover art.
---
 res/drawable/albumart_mp_unknown_list.png  | Bin 0 -> 1679 bytes
 res/layout/library_withcontrols.xml        |   6 +-----
 src/org/kreed/vanilla/LibraryActivity.java |   8 ++++++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 res/drawable/albumart_mp_unknown_list.png

diff --git a/res/drawable/albumart_mp_unknown_list.png b/res/drawable/albumart_mp_unknown_list.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc21fb1f67957d2da51c0528bb51550af9b6ebe8
GIT binary patch
literal 1679
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
Z{Q;mRyH6OW+-?8>002ovPDHLkV1lJ%4FLcE

literal 0
HcmV?d00001

diff --git a/res/layout/library_withcontrols.xml b/res/layout/library_withcontrols.xml
index 54f868d5..9bd3688e 100644
--- a/res/layout/library_withcontrols.xml
+++ b/res/layout/library_withcontrols.xml
@@ -34,17 +34,13 @@ THE SOFTWARE.
 			android:layout_height="80dip">
 			<ImageView
 				android:id="@+id/cover"
-				android:adjustViewBounds="true"
-				android:padding="2dip"
 				android:scaleType="fitCenter"
 				android:maxWidth="80dip"
-				android:layout_width="wrap_content"
+				android:layout_width="80dip"
 				android:layout_height="fill_parent"
 				android:layout_gravity="center" />
 			<TextView
 				android:id="@+id/status_text"
-				android:paddingLeft="3dip"
-				android:paddingRight="3dip"
 				android:text="@string/none"
 				android:textSize="16sp"
 				android:singleLine="true"
diff --git a/src/org/kreed/vanilla/LibraryActivity.java b/src/org/kreed/vanilla/LibraryActivity.java
index f2651454..ca26151e 100644
--- a/src/org/kreed/vanilla/LibraryActivity.java
+++ b/src/org/kreed/vanilla/LibraryActivity.java
@@ -801,8 +801,12 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
 				cover = song.getCover(this);
 			}
 
-			mCover.setImageBitmap(cover);
-			mCover.setVisibility(cover == null ? View.GONE : View.VISIBLE);
+			if (Song.mDisableCoverArt)
+				mCover.setVisibility(View.GONE);
+			else if (cover == null)
+				mCover.setImageResource(R.drawable.albumart_mp_unknown_list);
+			else
+				mCover.setImageBitmap(cover);
 		}
 	}