From 606d952ef33ee74dbb303a8870451252d7785f32 Mon Sep 17 00:00:00 2001
From: Christopher Baines <cbaines8@gmail.com>
Date: Fri, 9 Mar 2012 12:35:17 +0000
Subject: More search improvements.

---
 res/layout/find_activity.xml   | 36 ------------------------------------
 res/layout/search_activity.xml | 30 ++++++++++++++++++++++++++++++
 res/values/strings.xml         |  2 +-
 res/xml/searchable.xml         |  5 ++---
 4 files changed, 33 insertions(+), 40 deletions(-)
 delete mode 100644 res/layout/find_activity.xml
 create mode 100644 res/layout/search_activity.xml

(limited to 'res')

diff --git a/res/layout/find_activity.xml b/res/layout/find_activity.xml
deleted file mode 100644
index 6b19c67..0000000
--- a/res/layout/find_activity.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:gravity="center|top"
-    android:orientation="vertical"
-    android:theme="@android:style/Theme.NoTitleBar" >
-
-    <EditText
-        android:id="@+id/searchBar"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:inputType="textNoSuggestions" />
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/findContentLayout"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:gravity="center"
-        android:orientation="vertical" >
-
-        <ProgressBar
-            android:id="@+id/findLoadBar"
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-        <ListView
-            android:id="@+id/findListItems"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content" >
-        </ListView>
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/search_activity.xml b/res/layout/search_activity.xml
new file mode 100644
index 0000000..6e6bcd3
--- /dev/null
+++ b/res/layout/search_activity.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:gravity="center|top"
+    android:orientation="vertical"
+    android:theme="@android:style/Theme.NoTitleBar" >
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/findContentLayout"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:orientation="vertical" >
+
+        <ProgressBar
+            android:id="@+id/findLoadBar"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <ListView
+            android:id="@+id/findListItems"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" >
+        </ListView>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1009d3f..6ddf6a3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,7 +18,7 @@
     <string name="pref_bus_stop">Bus Stops</string>
     <string name="menu_about">About</string>
     <string name="menu_favourites">Favourites</string>
-    <string name="map_activity_search_hint">Search for buildings, and bus stops</string>
+    <string name="search_settings_description">Southampton University Map</string>
 
     <!-- Welcome Dialog -->
     <string name="welcome_dialog_title">Southampton University Map App</string>
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index 7262b3d..d6dedc8 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
-    android:hint="@string/map_activity_search_hint"
+    android:hint="@string/search_settings_description"
     android:includeInGlobalSearch="true"
     android:label="@string/app_name"
-    android:searchSettingsDescription="@string/map_activity_search_hint"
+    android:searchSettingsDescription="@string/search_settings_description"
     android:searchSuggestAuthority="net.cbaines.suma.provider"
     android:searchSuggestIntentAction="android.intent.action.VIEW"
-    android:searchSuggestIntentData="content://net.cbaines.suma.provider/building"
     android:searchSuggestSelection=" ?"
     android:searchSuggestThreshold="1" >
 
-- 
cgit v1.2.3