From 51f98b71aa30a8bc2bccead44f4fee82d8c7d7d4 Mon Sep 17 00:00:00 2001
From: Kevin Ruland <kruland@sunflower.com>
Date: Thu, 19 Jul 2012 14:44:39 +0000
Subject: [PATCH] Froyo had troubles with the old table layout.  Changed
 instead to the same layout style as used in the simulation edit/run dialog. 
 Added a localizable title string.

---
 android/res/layout/tcqueryform.xml            | 109 ++++++++----------
 android/res/values/strings.xml                |   1 +
 .../android/thrustcurve/TCQueryActivity.java  |   6 +-
 3 files changed, 50 insertions(+), 66 deletions(-)

diff --git a/android/res/layout/tcqueryform.xml b/android/res/layout/tcqueryform.xml
index fe37d805d..d739334ae 100644
--- a/android/res/layout/tcqueryform.xml
+++ b/android/res/layout/tcqueryform.xml
@@ -2,83 +2,64 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:descendantFocusability="beforeDescendants"
+    android:focusableInTouchMode="true"
+    android:minWidth="250dp"
     android:orientation="vertical" >
 
-    <!-- this is just here so the edittext doesn't get focus -->
-
-    <LinearLayout
-        android:layout_width="0px"
-        android:layout_height="0px"
-        android:focusable="true"
-        android:focusableInTouchMode="true" />
-
-    <TableLayout
-        android:id="@+id/tableLayout1"
-        android:layout_width="fill_parent"
+    <TextView
+        android:id="@+id/textView1"
+        style="@style/labelTextStyle"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-       >
+        android:text="@string/motor_manufacturer" />
 
-        <TableRow>
+    <Spinner
+        android:id="@+id/TCMotorSearchFormManufacturerField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:entries="@array/TCMotorSearchManufacturerList" />
 
-            <TextView
-                android:id="@+id/textView1"
-                android:text="@string/motor_manufacturer"
-                android:layout_weight="0" />
+    <TextView
+        style="@style/labelTextStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/motor_impulseclass" />
 
-            <Spinner
-                android:id="@+id/TCMotorSearchFormManufacturerField"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:entries="@array/TCMotorSearchManufacturerList" />
-        </TableRow>
+    <Spinner
+        android:id="@+id/TCMotorSearchFormImpulseField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:entries="@array/TCMotorSearchImpulseList" />
 
-        <TableRow>
+    <TextView
+        style="@style/labelTextStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/motor_commonname" />
 
-            <TextView
-                android:text="@string/motor_impulseclass" 
-                android:layout_weight="0"/>
+    <EditText
+        android:id="@+id/TCMotorSearchFormCommonNameField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="text"
+        android:text="" />
 
-            <Spinner
-                android:id="@+id/TCMotorSearchFormImpulseField"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:entries="@array/TCMotorSearchImpulseList" />
-        </TableRow>
+    <TextView
+        style="@style/labelTextStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/motor_diameter" />
 
-        <TableRow>
-
-            <TextView
-                android:text="@string/motor_commonname" 
-                android:layout_weight="0"/>
-
-            <EditText
-                android:inputType="text"
-                android:id="@+id/TCMotorSearchFormCommonNameField"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:text="" />
-        </TableRow>
-
-        <TableRow>
-
-            <TextView
-                android:text="@string/motor_diameter" 
-                android:layout_weight="0"/>
-
-            <Spinner
-                android:id="@+id/TCMotorSearchFormDiameterField"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:entries="@array/TCMotorSearchDiameterList" />
-        </TableRow>
-    </TableLayout>
+    <Spinner
+        android:id="@+id/TCMotorSearchFormDiameterField"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:entries="@array/TCMotorSearchDiameterList" />
 
     <Button
         android:id="@+id/TCMotorSearchFromSubmitButton"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:text="@string/TCMotorSearchFormSubmit" />
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 83ae8e294..485359c8c 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -30,6 +30,7 @@
     </string-array>
 
     <string name="TCMotorSearchFormSubmit">Submit</string>
+    <string name="TCMotorSearchFormTitle">Thrustcurve.org Search Criteria</string>
     <string name="overviewConfigurationSpinnerPrompt">Select Configuration</string>
     <string name="simulationSeries1Label">Series 1</string>
     <string name="simulationSeries2Label">Series 2</string>
diff --git a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
index c27c7744a..9bb4e2dcc 100644
--- a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
+++ b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryActivity.java
@@ -4,19 +4,21 @@ import net.sf.openrocket.R;
 import net.sf.openrocket.android.util.AndroidLogWrapper;
 import net.sf.openrocket.android.util.ErrorDialogFragment;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
 
-public class TCQueryActivity extends FragmentActivity
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+
+public class TCQueryActivity extends SherlockFragmentActivity
 implements TCQueryAction.OnTCQueryCompleteListener
 {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		setTitle(R.string.TCMotorSearchFormTitle);
 		setContentView(R.layout.tcqueryform);
 
 		final Spinner manufacturerField = (Spinner) findViewById(R.id.TCMotorSearchFormManufacturerField);