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 /AndroidManifest.xml | |
| 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 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3d47148..04e0d73 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -60,6 +60,8 @@ </activity> <activity android:name=".SearchResultsActivity" > </activity> + <activity android:name=".SearchResultsActivity" > + </activity> <activity android:name="BusStopActivity" > <intent-filter android:label="@string/app_name" > <action android:name="android.intent.action.VIEW" /> @@ -166,7 +168,11 @@ <!-- Provides search suggestions for words and their definitions. --> <provider android:name=".MapContentProvider" - android:authorities="net.cbaines.suma.provider" /> + 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 |