From e1247eedcf5fbfa6bf95c20f0e216d008926d4b6 Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Sun, 23 Sep 2012 14:53:35 +0200
Subject: [PATCH] merge 'legacy' layout files

---
 res/layout-v11/new_playlist_dialog.xml | 61 -----------------
 res/layout-v11/notification.xml        | 90 --------------------------
 res/layout-v14/new_playlist_dialog.xml | 61 -----------------
 res/layout/new_playlist_dialog.xml     | 31 +++++----
 res/layout/notification.xml            | 37 ++++++++++-
 5 files changed, 54 insertions(+), 226 deletions(-)
 delete mode 100644 res/layout-v11/new_playlist_dialog.xml
 delete mode 100644 res/layout-v11/notification.xml
 delete mode 100644 res/layout-v14/new_playlist_dialog.xml

diff --git a/res/layout-v11/new_playlist_dialog.xml b/res/layout-v11/new_playlist_dialog.xml
deleted file mode 100644
index 9f620d98..00000000
--- a/res/layout-v11/new_playlist_dialog.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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:divider="?android:attr/dividerHorizontal"
-	android:showDividers="middle"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content">
-	<EditText
-		android:id="@+id/playlist_name"
-		android:inputType="text"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:singleLine="true"
-		android:layout_marginBottom="8dip"
-		android:layout_marginLeft="8dip"
-		android:layout_marginRight="8dip" />
-	<LinearLayout
-		style="?android:attr/buttonBarStyle"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-		<Button
-			style="?android:attr/buttonBarButtonStyle"
-			android:id="@+id/create"
-			android:layout_width="0px"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/create"
-			android:singleLine="true" />
-		<Button
-			style="?android:attr/buttonBarButtonStyle"
-			android:id="@+id/cancel"
-			android:layout_width="0px"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/cancel"
-			android:singleLine="true" />
-	</LinearLayout>
-</LinearLayout>
diff --git a/res/layout-v11/notification.xml b/res/layout-v11/notification.xml
deleted file mode 100644
index 394e3233..00000000
--- a/res/layout-v11/notification.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?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:maxWidth="80dip"
-		android:adjustViewBounds="true"
-		android:layout_width="wrap_content"
-		android:layout_height="fill_parent"
-		android:layout_marginRight="5dip"
-		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-v14/new_playlist_dialog.xml b/res/layout-v14/new_playlist_dialog.xml
deleted file mode 100644
index d8f21193..00000000
--- a/res/layout-v14/new_playlist_dialog.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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:divider="?android:attr/dividerHorizontal"
-	android:showDividers="middle"
-	android:orientation="vertical"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content">
-	<EditText
-		android:id="@+id/playlist_name"
-		android:inputType="text"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:singleLine="true"
-		android:layout_marginBottom="8dip"
-		android:layout_marginLeft="8dip"
-		android:layout_marginRight="8dip" />
-	<LinearLayout
-		style="?android:attr/buttonBarStyle"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-		<Button
-			style="?android:attr/buttonBarButtonStyle"
-			android:id="@+id/cancel"
-			android:layout_width="0px"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/cancel"
-			android:singleLine="true" />
-		<Button
-			style="?android:attr/buttonBarButtonStyle"
-			android:id="@+id/create"
-			android:layout_width="0px"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/create"
-			android:singleLine="true" />
-	</LinearLayout>
-</LinearLayout>
diff --git a/res/layout/new_playlist_dialog.xml b/res/layout/new_playlist_dialog.xml
index 494f11b4..d8f21193 100644
--- a/res/layout/new_playlist_dialog.xml
+++ b/res/layout/new_playlist_dialog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010 Christopher Eby <kreed@kreed.org>
+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
@@ -20,7 +20,10 @@ 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"
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:divider="?android:attr/dividerHorizontal"
+	android:showDividers="middle"
 	android:orientation="vertical"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content">
@@ -34,21 +37,25 @@ THE SOFTWARE.
 		android:layout_marginLeft="8dip"
 		android:layout_marginRight="8dip" />
 	<LinearLayout
+		style="?android:attr/buttonBarStyle"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:paddingTop="6dip"
-		android:background="#fff" >
-		<Button android:id="@+id/create"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="@string/create"
-			android:singleLine="true" />
-		<Button android:id="@+id/cancel"
-			android:layout_width="wrap_content"
+		android:orientation="horizontal">
+		<Button
+			style="?android:attr/buttonBarButtonStyle"
+			android:id="@+id/cancel"
+			android:layout_width="0px"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:text="@string/cancel"
 			android:singleLine="true" />
+		<Button
+			style="?android:attr/buttonBarButtonStyle"
+			android:id="@+id/create"
+			android:layout_width="0px"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/create"
+			android:singleLine="true" />
 	</LinearLayout>
 </LinearLayout>
diff --git a/res/layout/notification.xml b/res/layout/notification.xml
index 8e26041d..394e3233 100644
--- a/res/layout/notification.xml
+++ b/res/layout/notification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2010 Christopher Eby <kreed@kreed.org>
+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
@@ -35,8 +35,9 @@ THE SOFTWARE.
 		android:layout_marginRight="5dip"
 		android:contentDescription="@string/cover_art" />
 	<LinearLayout
-		android:layout_width="fill_parent"
+		android:layout_width="0px"
 		android:layout_height="wrap_content"
+		android:layout_weight="1"
 		android:layout_gravity="center"
 		android:orientation="vertical">
 		<TextView
@@ -54,4 +55,36 @@ THE SOFTWARE.
 			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>