Added prev/pause/next buttons to notification bar

4 files changed, 94 insertions, 30 deletions

diff --git a/subsonic-android/res/drawable/notification_next.png b/subsonic-android/res/drawable/notification_next.png
new file mode 100644
index 00000000..5835f654
--- /dev/null
+++ b/subsonic-android/res/drawable/notification_next.png
diff --git a/subsonic-android/res/drawable/notification_pause.png b/subsonic-android/res/drawable/notification_pause.png
new file mode 100644
index 00000000..3324f88f
--- /dev/null
+++ b/subsonic-android/res/drawable/notification_pause.png
diff --git a/subsonic-android/res/drawable/notification_prev.png b/subsonic-android/res/drawable/notification_prev.png
new file mode 100644
index 00000000..73fb16f2
--- /dev/null
+++ b/subsonic-android/res/drawable/notification_prev.png
diff --git a/subsonic-android/res/layout/notification.xml b/subsonic-android/res/layout/notification.xml
index c2edfb9b..a234f71e 100644
--- a/subsonic-android/res/layout/notification.xml
+++ b/subsonic-android/res/layout/notification.xml
@@ -1,31 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:padding="3dp">
-	<ImageView 
-		android:id="@+id/notification_image"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:layout_marginRight="10dp"
-		android:layout_marginLeft="5dp"/>
-	<TextView 
-		android:id="@+id/notification_title"
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent"
-		android:textSize="16sp"
-		android:textStyle="bold"
-		android:textColor="@color/notificationTitle"
-		android:singleLine="true"
-		android:layout_toRightOf="@id/notification_image"
-		android:layout_alignParentTop="true"/>
-	<TextView 
-		android:id="@+id/notification_artist"
-		android:layout_height="wrap_content"
-		android:layout_width="fill_parent"
-		android:textSize="15sp"
-		android:textColor="@color/notificationArtist"
-		android:singleLine="true"
-		android:layout_toRightOf="@id/notification_image"
-		android:layout_below="@id/notification_title"/>
-</RelativeLayout>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/statusbar"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal" >
+
+        <ImageView
+            android:id="@+id/notification_image"
+            android:layout_width="64.0dip"
+            android:layout_height="64.0dip"
+            android:layout_weight="0.0"
+            android:gravity="center" />
+
+        <LinearLayout
+            android:layout_width="0.0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1.0"
+            android:orientation="vertical"
+            android:paddingLeft="11.0dip" >
+
+            <TextView
+                android:id="@+id/notification_title"
+                style="@android:style/TextAppearance.StatusBar.EventContent.Title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:id="@+id/notification_artist"
+                style="@android:style/TextAppearance.StatusBar.EventContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="end"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+
+            <TextView
+                android:id="@+id/notification_album"
+                style="@android:style/TextAppearance.StatusBar.EventContent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="left"
+                android:ellipsize="end"
+                android:scrollHorizontally="true"
+                android:singleLine="true" />
+        </LinearLayout>
+
+        <ImageButton
+            android:id="@+id/control_previous"
+            android:src="@drawable/notification_prev"
+            android:background="@android:color/transparent"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"/>
+
+        <ImageButton
+            android:id="@+id/control_pause"
+            android:src="@drawable/notification_pause"
+            android:background="@android:color/transparent"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"/>
+
+        <ImageButton
+            android:id="@+id/control_next"
+            android:src="@drawable/notification_next"
+            android:background="@android:color/transparent"
+            android:layout_width="40dip"
+            android:layout_height="40dip"
+            android:layout_gravity="center|right"
+            android:layout_marginRight="5dip"
+            android:layout_marginTop="2dip"
+            android:layout_weight="0.0"/>
+
+    </LinearLayout>
+
+</LinearLayout>