aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorChristopher Baines <cbaines8@gmail.com>2012-03-09 12:35:17 +0000
committerChristopher Baines <cbaines8@gmail.com>2012-03-09 12:35:17 +0000
commit606d952ef33ee74dbb303a8870451252d7785f32 (patch)
tree1bf140512141ce8618105068b5152b231e9351d1 /res
parentc2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7 (diff)
downloadsouthamptonuniversitymap-606d952ef33ee74dbb303a8870451252d7785f32.tar
southamptonuniversitymap-606d952ef33ee74dbb303a8870451252d7785f32.tar.gz
More search improvements.
Diffstat (limited to 'res')
-rw-r--r--res/layout/search_activity.xml (renamed from res/layout/find_activity.xml)6
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/searchable.xml5
3 files changed, 3 insertions, 10 deletions
diff --git a/res/layout/find_activity.xml b/res/layout/search_activity.xml
index 6b19c67..6e6bcd3 100644
--- a/res/layout/find_activity.xml
+++ b/res/layout/search_activity.xml
@@ -6,12 +6,6 @@
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"
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" >