From fca59007366e23738a3c5c624bb784afaa3107f3 Mon Sep 17 00:00:00 2001
From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Fri, 10 Feb 2012 02:26:09 +0000
Subject: [PATCH] Fix two layout issues with the ThrustCurve query form layout.
  1) use a trick to prevent the keyboard from appearing automatically on ICS
 (and perhaps other) tables.  2) move the submit button to be tight to the
 bottom of the form since then even if the keyboard is up, you can still press
 it.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@404 180e2498-e6e9-4542-8430-84ac67f01cd8
---
 android/res/layout/tcqueryform.xml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/android/res/layout/tcqueryform.xml b/android/res/layout/tcqueryform.xml
index f6fc7c8f..77c15e5d 100644
--- a/android/res/layout/tcqueryform.xml
+++ b/android/res/layout/tcqueryform.xml
@@ -1,16 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     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"
         android:layout_height="wrap_content"
         android:stretchColumns="1" >
 
-        <TableRow >
+        <TableRow>
 
             <TextView
                 android:id="@+id/textView1"
@@ -23,7 +31,7 @@
                 android:entries="@array/TCMotorSearchManufacturerList" />
         </TableRow>
 
-        <TableRow >
+        <TableRow>
 
             <TextView
                 android:id="@+id/textView1"
@@ -36,7 +44,7 @@
                 android:entries="@array/TCMotorSearchImpulseList" />
         </TableRow>
 
-        <TableRow >
+        <TableRow>
 
             <TextView
                 android:id="@+id/textView1"
@@ -47,7 +55,7 @@
                 android:text="" />
         </TableRow>
 
-        <TableRow >
+        <TableRow>
 
             <TextView
                 android:id="@+id/textView1"
@@ -65,8 +73,7 @@
         android:id="@+id/TCMotorSearchFromSubmitButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center_horizontal"
         android:text="@string/TCMotorSearchFormSubmit" />
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
-- 
2.47.2