Share layout content between library with/without control layouts.

Also make search box not overlap.

res/layout/library_content.xml

@@ -21,11 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-	<LinearLayout
-		android:id="@+id/selector_layout"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:orientation="vertical">
 	<TabHost
 		android:id="@android:id/tabhost"
 		android:layout_width="fill_parent"
@@ -71,7 +66,6 @@ THE SOFTWARE.
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom|left" />
-	</LinearLayout>
 	<RelativeLayout
 		android:id="@+id/search_box"
 		android:layout_width="fill_parent"

res/layout/library_nocontrols.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2010 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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+	<LinearLayout
+		android:id="@+id/selector_layout"
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:orientation="vertical">
+		<include layout="@layout/library_content" />
+	</LinearLayout>
+</merge>

res/layout/library_withcontrols.xml

@@ -26,51 +26,7 @@ THE SOFTWARE.
 		android:layout_width="fill_parent"
 		android:layout_height="fill_parent"
 		android:orientation="vertical">
-		<TabHost
+		<include layout="@layout/library_content" />
-			android:id="@android:id/tabhost"
-			android:layout_width="fill_parent"
-			android:layout_height="0px"
-			android:layout_weight="1">
-			<LinearLayout
-				android:orientation="vertical"
-				android:layout_width="fill_parent"
-				android:layout_height="fill_parent">
-				<TabWidget
-					android:id="@android:id/tabs"
-					android:layout_width="fill_parent"
-					android:layout_height="wrap_content" />
-				<FrameLayout
-					android:id="@android:id/tabcontent"
-					android:layout_width="fill_parent"
-					android:layout_height="fill_parent">
-					<ListView
-						android:id="@+id/artist_list"
-						android:layout_width="fill_parent"
-						android:layout_height="fill_parent" />
-					<ListView
-						android:id="@+id/album_list"
-						android:layout_width="fill_parent"
-						android:layout_height="fill_parent" />
-					<ListView
-						android:id="@+id/song_list"
-						android:layout_width="fill_parent"
-						android:layout_height="fill_parent" />
-					<ListView
-						android:id="@+id/playlist_list"
-						android:layout_width="fill_parent"
-						android:layout_height="fill_parent" />
-					<ListView
-						android:id="@+id/genre_list"
-						android:layout_width="fill_parent"
-						android:layout_height="fill_parent" />
-				</FrameLayout>
-			</LinearLayout>
-		</TabHost>
-		<LinearLayout
-			android:id="@+id/limiter_layout"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="bottom|left" />
 		<RelativeLayout
 			android:id="@+id/controls"
 			android:layout_width="fill_parent"
@@ -125,26 +81,4 @@ THE SOFTWARE.
 			</LinearLayout>
 		</RelativeLayout>
 	</LinearLayout>
-	<RelativeLayout
-		android:id="@+id/search_box"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
-		android:paddingTop="4dip"
-		android:paddingLeft="4dip"
-		android:paddingRight="4dip"
-		android:visibility="gone"
-		android:background="@drawable/search_background">
-		<EditText
-			android:id="@+id/filter_text"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:inputType="textFilter" />
-		<org.kreed.vanilla.ControlButton
-			android:id="@+id/clear_button"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentRight="true"
-			android:src="@android:drawable/ic_menu_close_clear_cancel" />
-	</RelativeLayout>
 </merge>

src/org/kreed/vanilla/LibraryActivity.java

@@ -112,7 +112,7 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
 
 		SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
 		if (settings.getBoolean("controls_in_selector", false)) {
-			setContentView(R.layout.song_selector_controls);
+			setContentView(R.layout.library_withcontrols);
 
 			mControls = findViewById(R.id.controls);
 
@@ -127,7 +127,7 @@ public class LibraryActivity extends PlaybackActivity implements AdapterView.OnI
 			mPlayPauseButton.setOnClickListener(this);
 			next.setOnClickListener(this);
 		} else {
-			setContentView(R.layout.song_selector);
+			setContentView(R.layout.library_nocontrols);
 		}
 
 		mTabHost = (TabHost)findViewById(android.R.id.tabhost);