From 07858677d17b21e37652979bd34642698bae4497 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 30 Jun 2013 22:10:13 -0700
Subject: Remove extra abstraction, fix other cases needing new id method

---
 subsonic-android/res/layout/select_album.xml | 53 +++++++++++++---------------
 1 file changed, 24 insertions(+), 29 deletions(-)

(limited to 'subsonic-android/res')

diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml
index 4fddf330..01df495a 100644
--- a/subsonic-android/res/layout/select_album.xml
+++ b/subsonic-android/res/layout/select_album.xml
@@ -1,36 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/select_album_layout"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
 
-	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:orientation="vertical"
+	<View
 		android:layout_width="fill_parent"
-		android:layout_height="fill_parent">
+		android:layout_height="1px"
+		android:background="@color/dividerColor"/>
 
-		<View
-			android:layout_width="fill_parent"
-			android:layout_height="1px"
-			android:background="@color/dividerColor"/>
+	<include layout="@layout/tab_progress"/>
 
-		<include layout="@layout/tab_progress"/>
-
-		<TextView
-			android:id="@+id/select_album_empty"
-			android:text="@string/select_album.empty"
-			android:visibility="gone"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:padding="10dip"/>
+	<TextView
+		android:id="@+id/select_album_empty"
+		android:text="@string/select_album.empty"
+		android:visibility="gone"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dip"/>
 
-		<com.mobeta.android.dslv.DragSortListView
-			style="@style/DragDropListView"
-			android:id="@+id/select_album_entries"
-			android:textFilterEnabled="true"
-			android:layout_width="fill_parent"
-			android:layout_height="0dip"
-			android:layout_weight="1.0"
-			android:fastScrollEnabled="true"/>
-	</LinearLayout>
-</FrameLayout>
\ No newline at end of file
+	<com.mobeta.android.dslv.DragSortListView
+		style="@style/DragDropListView"
+		android:id="@+id/select_album_entries"
+		android:textFilterEnabled="true"
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1.0"
+		android:fastScrollEnabled="true"/>
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3