From 9de22b37c9867a1c97913576dce08144ec23db01 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Sun, 4 Nov 2012 17:16:17 +0100
Subject: [PATCH] Fix notification-area album cover We are now using a fixed
 size for the image - JellyBean needs a seperate layout file as the gap
 between the cover + text changed

---
 res/layout-v16/notification.xml | 88 +++++++++++++++++++++++++++++++++
 res/layout/notification.xml     |  8 ++-
 2 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 res/layout-v16/notification.xml

diff --git a/res/layout-v16/notification.xml b/res/layout-v16/notification.xml
new file mode 100644
index 00000000..72ca6773
--- /dev/null
+++ b/res/layout-v16/notification.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:layout_gravity="center_vertical"
+	android:orientation="horizontal">
+	<ImageView
+		android:id="@+id/cover"
+		android:scaleType="fitCenter"
+		android:layout_width="64dip"
+		android:layout_height="64dip"
+		android:layout_marginRight="8dip"
+		android:contentDescription="@string/cover_art" />
+	<LinearLayout
+		android:layout_width="0px"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:layout_gravity="center"
+		android:orientation="vertical">
+		<TextView
+			android:id="@+id/title"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
+			android:singleLine="true"
+			android:ellipsize="marquee" />
+		<TextView
+			android:id="@+id/artist"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent"
+			android:singleLine="true"
+			android:ellipsize="marquee" />
+	</LinearLayout>
+	<ImageButton
+		android:id="@+id/play_pause"
+		android:paddingTop="5dip"
+		android:paddingBottom="5dip"
+		android:layout_height="42dip"
+		android:layout_width="wrap_content"
+		android:layout_gravity="center"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/play"
+		android:contentDescription="@string/play_pause" />
+	<ImageButton
+		android:id="@+id/next"
+		android:paddingTop="5dip"
+		android:paddingBottom="5dip"
+		android:layout_height="42dip"
+		android:layout_width="wrap_content"
+		android:layout_gravity="center"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/next"
+		android:contentDescription="@string/next_song" />
+	<ImageButton
+		android:id="@+id/close"
+		android:padding="5dip"
+		android:layout_height="42dip"
+		android:layout_width="wrap_content"
+		android:layout_gravity="center"
+		android:background="?android:attr/selectableItemBackground"
+		android:scaleType="fitCenter"
+		android:src="@drawable/notification_close"
+		android:contentDescription="@string/close_notification" />
+</LinearLayout>
diff --git a/res/layout/notification.xml b/res/layout/notification.xml
index 394e3233..bfc6e671 100644
--- a/res/layout/notification.xml
+++ b/res/layout/notification.xml
@@ -28,11 +28,9 @@ THE SOFTWARE.
 	<ImageView
 		android:id="@+id/cover"
 		android:scaleType="fitCenter"
-		android:maxWidth="80dip"
-		android:adjustViewBounds="true"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:layout_marginRight="5dip"
+		android:layout_width="64dip"
+		android:layout_height="64dip"
+		android:layout_marginRight="12dip"
 		android:contentDescription="@string/cover_art" />
 	<LinearLayout
 		android:layout_width="0px"