From 52b1064298e9f47c573a0fbdc168f72e80f12877 Mon Sep 17 00:00:00 2001
From: Steve Slaven <bpk@hoopajoo.net>
Date: Mon, 10 Jan 2011 10:01:08 -0800
Subject: Make each button 1 row, 2 per row gets too squished


diff --git a/res/layout/configure_extra.xml b/res/layout/configure_extra.xml
index 0f65862..8f7ee9c 100644
--- a/res/layout/configure_extra.xml
+++ b/res/layout/configure_extra.xml
@@ -25,66 +25,43 @@
 		android:layout_height="wrap_content"
 		>
 
-	<LinearLayout
-		android:id="@+id/extra_row1"
-		android:gravity="center"
+	<Spinner
+		android:id="@+id/extra_custom1"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-		<Spinner
-			android:id="@+id/extra_custom1"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="custom"/>
-		<Spinner
-			android:id="@+id/extra_custom2"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="custom"/>
-	</LinearLayout>
-	
-	<LinearLayout
-		android:id="@+id/extra_row2"
-		android:gravity="center"
+		android:layout_weight="1"
+		android:text="custom"/>
+	<Spinner
+		android:id="@+id/extra_custom2"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-		<Spinner
-			android:id="@+id/extra_custom3"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="custom"/>
-		<Spinner
-			android:id="@+id/extra_custom4"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="custom"/>
-	</LinearLayout>
-			
-	<LinearLayout
-		android:id="@+id/extra_row3"
-		android:gravity="center"
+		android:layout_weight="1"
+		android:text="custom"/>	
+	<Spinner
+		android:id="@+id/extra_custom3"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-		<Spinner
-			android:id="@+id/extra_custom5"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="custom"/>
-		<Spinner
-			android:id="@+id/extra_custom6"
-			android:layout_width="fill_parent"
-			android:layout_height="wrap_content"
-			android:layout_weight="1"
-			android:text="custom6"/>
-	</LinearLayout>
-	
+		android:layout_weight="1"
+		android:text="custom"/>
+	<Spinner
+		android:id="@+id/extra_custom4"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:text="custom"/>
+	<Spinner
+		android:id="@+id/extra_custom5"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:text="custom"/>
+	<Spinner
+		android:id="@+id/extra_custom6"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:text="custom6"/>
+
 	<LinearLayout
 		android:id="@+id/extra_row_modify"
 		android:gravity="center"
diff --git a/res/layout/service_extra.xml b/res/layout/service_extra.xml
index 674153f..ded0263 100644
--- a/res/layout/service_extra.xml
+++ b/res/layout/service_extra.xml
@@ -89,12 +89,6 @@
 	</LinearLayout>
 
 	<!--  these are user-customizable buttons -->
-	<LinearLayout
-		android:id="@+id/extra_row1"
-		android:gravity="center"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
 		<Button
 			android:id="@+id/extra_custom1"
 			android:layout_width="fill_parent"
@@ -107,14 +101,6 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:text="custom"/>
-	</LinearLayout>
-	
-	<LinearLayout
-		android:id="@+id/extra_row2"
-		android:gravity="center"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
 		<Button
 			android:id="@+id/extra_custom3"
 			android:layout_width="fill_parent"
@@ -127,14 +113,6 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:text="custom"/>
-	</LinearLayout>
-			
-	<LinearLayout
-		android:id="@+id/extra_row3"
-		android:gravity="center"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
 		<Button
 			android:id="@+id/extra_custom5"
 			android:layout_width="fill_parent"
@@ -147,5 +125,4 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:text="custom"/>
-	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
-- 
cgit v0.10.2