On delete cache don't pop back to the top of the list

1 files changed, 56 insertions, 66 deletions

diff --git a/subsonic-android/res/layout/select_album_header.xml b/subsonic-android/res/layout/select_album_header.xml
index 7f5fb767..6905d421 100644
--- a/subsonic-android/res/layout/select_album_header.xml
+++ b/subsonic-android/res/layout/select_album_header.xml
@@ -1,69 +1,59 @@
 <?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="wrap_content">
+		
+	<ImageView
+		android:id="@+id/select_album_art"
+		android:src="@drawable/unknown_album_large"
+		android:layout_width="120dip"
+		android:layout_height="120dip"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentLeft="true"
+		android:layout_marginRight="10dip"
+		android:scaleType="fitCenter"
+		android:contentDescription="@null"/>
+
+	<TextView
+		android:text="This is the album title"
+		android:id="@+id/select_album_title"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_toRightOf="@+id/select_album_art"
+		android:paddingTop="20dip"
+		android:paddingBottom="8dip"
+		android:paddingRight="4dip"
+		android:textColor="@color/mediaControlForeground"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:textStyle="bold"
+		android:singleLine="true"
+		android:ellipsize="end"/>
+
+	<TextView
+		android:text="This is the artist name"
+		android:id="@+id/select_album_artist"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/select_album_title"
+		android:layout_toRightOf="@+id/select_album_art"
+		android:paddingBottom="2dip"
+		android:paddingRight="4dip"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:singleLine="true"
+		android:ellipsize="end"/>
+
+	<TextView
+		android:text="XX SONGS"
+		android:id="@+id/select_album_song_count"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_below="@+id/select_album_artist"
+		android:layout_toRightOf="@+id/select_album_art"
+		android:paddingRight="4dip"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:textSize="10sp"
+		android:singleLine="true"
+		android:ellipsize="none"/>
+</RelativeLayout>
 
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content">
 
-    <LinearLayout
-            android:orientation="horizontal"
-            android:background="@drawable/menubar_button_normal"
-            android:paddingTop="6dip"
-            android:paddingBottom="4dip"
-            android:paddingLeft="6dp"
-            android:paddingRight="6dp"
-            android:layout_weight="1"
-            android:layout_width="fill_parent"
-            android:layout_height="0dip">
-
-        <ImageView
-                android:id="@+id/select_album_cover_art"
-                android:layout_gravity="center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-        <LinearLayout
-                android:orientation="vertical"
-                android:layout_weight="1"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content">
-
-            <TextView
-                    android:id="@+id/select_album_text1"
-                    android:singleLine="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dip"
-                    android:layout_marginRight="10dip"
-                    android:textColor="@android:color/primary_text_light"
-                    android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-            <TextView
-                    android:id="@+id/select_album_text2"
-                    android:singleLine="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dip"
-                    android:layout_marginRight="10dip"
-                    android:textColor="@android:color/secondary_text_light"
-                    android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-        </LinearLayout>
-
-        <ImageButton
-                android:id="@+id/select_album_play_all"
-                android:src="@drawable/select_album_play_all"
-                android:background="@android:color/transparent"
-                android:layout_gravity="center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-    </LinearLayout>
-
-    <View
-            android:layout_width="fill_parent"
-            android:layout_height="1px"
-            android:background="@color/dividerColor"/>
-
-</LinearLayout>