From 2b5b8b043a1d6f56102b949bccfcb507de36336f Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Mon, 30 Dec 2013 21:30:51 -0500
Subject: [PATCH] Fixed searching in landscape mode.

---
 .../core/res/layout-land/search_result_list.xml    | 81 ++++++++++------------
 .../Android/core/res/layout/search_result_list.xml |  4 +-
 2 files changed, 38 insertions(+), 47 deletions(-)

diff --git a/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml b/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml
index ebf6b64bec..7131040b6d 100644
--- a/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml
+++ b/Open-ILS/src/Android/core/res/layout-land/search_result_list.xml
@@ -5,60 +5,52 @@
                 android:background="@color/background"
         >
 
-    <RelativeLayout
+    <LinearLayout
+            android:id="@+id/search_text_container"
+            android:orientation="horizontal"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:background="@drawable/grey_rounded_corners"
-            android:paddingTop="3dip"
-            >
+            android:padding="4dp"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:layout_below="@id/action_bar_home_button">
 
-        <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="fill_parent"
+        <EditText
+                android:id="@+id/searchText"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="4dp"
-                android:id="@+id/search_text_container"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:layout_below="@id/action_bar_home_button">
+                android:hint="@string/search_hint"
+                android:singleLine="true"
+                android:layout_weight="1"/>
 
-            <EditText
-                    android:id="@+id/searchText"
-                    android:layout_width="0dip"
-                    android:layout_height="wrap_content"
-                    android:hint="@string/search_hint"
-                    android:singleLine="true"
-                    android:layout_weight="1"/>
+    </LinearLayout>
 
-        </LinearLayout>
+    <LinearLayout
+            android:id="@+id/search_spinner_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/search_text_container">
 
-        <LinearLayout
+        <Spinner
+                android:id="@+id/chose_organisation"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/search_text_container">
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1"/>
 
-            <Spinner
-                    android:id="@+id/chose_organisation"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_weight="1"/>
-
-            <ImageButton
-                    android:id="@+id/searchButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_action_search"
-                    android:paddingLeft="10dp"
-                    android:paddingRight="10dp"
-                    android:paddingTop="5dp"
-                    android:paddingBottom="5dp"/>
-
-        </LinearLayout>
+        <ImageButton
+                android:id="@+id/searchButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/ic_action_search"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingTop="5dp"
+                android:paddingBottom="5dp"/>
 
-    </RelativeLayout>
+    </LinearLayout>
 
+    <!--
     <LinearLayout
             android:id="@+id/search_preference_options"
             android:layout_width="fill_parent"
@@ -69,12 +61,13 @@
             android:background="@drawable/background_grey_image"
             android:gravity="center"
             >
-
     </LinearLayout>
+    -->
+
     <LinearLayout android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:id="@+id/search_text"
-                  android:layout_below="@id/search_preference_options"
+                  android:layout_below="@id/search_spinner_container"
             >
         <TextView
                 android:id="@+id/search_result_number"
diff --git a/Open-ILS/src/Android/core/res/layout/search_result_list.xml b/Open-ILS/src/Android/core/res/layout/search_result_list.xml
index e3ab0bd214..335b58e188 100644
--- a/Open-ILS/src/Android/core/res/layout/search_result_list.xml
+++ b/Open-ILS/src/Android/core/res/layout/search_result_list.xml
@@ -49,10 +49,8 @@
                     android:paddingTop="5dp"
                     android:src="@drawable/ic_action_search"/>
         </LinearLayout>
-
     </LinearLayout>
 
-
     <LinearLayout
             android:id="@+id/search_text"
             android:layout_width="fill_parent"
@@ -74,4 +72,4 @@
             android:layout_below="@id/search_text">
     </ListView>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
-- 
2.11.0