aboutsummaryrefslogtreecommitdiff
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorChristopher Baines <cbaines8@gmail.com>2012-03-14 01:01:14 +0000
committerChristopher Baines <cbaines8@gmail.com>2012-03-14 01:01:14 +0000
commit5bac2465e7ee4e136ebec0b65f8e52ef8b4df232 (patch)
tree1ccd78f3152c19de6c7f14861b1a7d2d7ae92efa /AndroidManifest.xml
parent93c8cd480ea46d49dd7ad1ba9515443797a4a8c1 (diff)
parent19e189ef9ed67f382fea00e48f997ce8e979f030 (diff)
downloadsouthamptonuniversitymap-5bac2465e7ee4e136ebec0b65f8e52ef8b4df232.tar
southamptonuniversitymap-5bac2465e7ee4e136ebec0b65f8e52ef8b4df232.tar.gz
Merge branch 'dev'
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml24
1 files changed, 19 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b0a2287..24b5cd1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.cbaines.suma"
- android:versionCode="11"
- android:versionName="0.8 (alpha)" >
+ android:versionCode="12"
+ android:versionName="0.9 (beta)" >
<uses-sdk
- android:minSdkVersion="7"
+ android:minSdkVersion="8"
android:targetSdkVersion="10" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -50,8 +50,13 @@
<data android:scheme="geo" />
</intent-filter>
- </activity>
- <activity android:name="FindActivity" >
+ <intent-filter>
+ <action android:name="android.intent.action.SEARCH" />
+ </intent-filter>
+
+ <meta-data
+ android:name="android.app.searchable"
+ android:resource="@xml/searchable" />
</activity>
<activity android:name="BusStopActivity" >
<intent-filter android:label="@string/app_name" >
@@ -155,6 +160,15 @@
android:name=".PreferencesActivity"
android:label="@string/preferences" >
</activity>
+
+ <!-- Provides search suggestions for words and their definitions. -->
+ <provider
+ android:name=".MapContentProvider"
+ android:authorities="net.cbaines.suma.provider" >
+ <path-permission
+ android:pathPrefix="/search_suggest_query"
+ android:readPermission="android.permission.GLOBAL_SEARCH" />
+ </provider>
</application>
</manifest> \ No newline at end of file