diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-03-11 13:37:46 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-11 13:37:46 +0000 |
| commit | acbff20cc3eb148621e1ffed9b06d17a2a1f53ce (patch) | |
| tree | d249ffc6e531887760209b71cf4c3b0837b82dab /res | |
| parent | 264b93bd42753d66dbcaea74ed2024ecb757b5f7 (diff) | |
| parent | 120ca654b0476a628d2d53e709804066ecb73992 (diff) | |
| download | southamptonuniversitymap-acbff20cc3eb148621e1ffed9b06d17a2a1f53ce.tar southamptonuniversitymap-acbff20cc3eb148621e1ffed9b06d17a2a1f53ce.tar.gz | |
Merge branch 'dev' of github.com:cbaines/SouthamptonUniversityMap into dev
Conflicts:
AndroidManifest.xml
src/net/cbaines/suma/MapActivity.java
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.xml | 3 | ||||
| -rw-r--r-- | res/xml/searchable.xml | 5 |
3 files changed, 4 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..7a62ceb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -18,7 +18,8 @@ <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> + <string name="search_results_dialog_title">Search Results</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" > |