From 35d64a1c9dd0c1c6e4eef59311ca0dcbf309c09d Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Wed, 29 Feb 2012 20:38:23 -0600
Subject: [PATCH] Show correct button order on Honeycomb

---
 res/layout-v11/new_playlist_dialog.xml | 16 +++----
 res/layout-v14/new_playlist_dialog.xml | 61 ++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 8 deletions(-)
 create 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
index d8f21193..9f620d98 100644
--- a/res/layout-v11/new_playlist_dialog.xml
+++ b/res/layout-v11/new_playlist_dialog.xml
@@ -41,14 +41,6 @@ THE SOFTWARE.
 		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"
@@ -57,5 +49,13 @@ THE SOFTWARE.
 			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-v14/new_playlist_dialog.xml b/res/layout-v14/new_playlist_dialog.xml
new file mode 100644
index 00000000..d8f21193
--- /dev/null
+++ b/res/layout-v14/new_playlist_dialog.xml
@@ -0,0 +1,61 @@
+<?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>