diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-03-09 10:49:50 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-09 10:49:50 +0000 |
| commit | c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7 (patch) | |
| tree | 69ba7ee4c132b2bf6ec138fdcaf0988309b40e56 /AndroidManifest.xml | |
| parent | a32b31c29d45b68918ec2a28fff7d87e675c6768 (diff) | |
| parent | 4a45362d8823a84cf9c3c805c006331303a0da33 (diff) | |
| download | southamptonuniversitymap-c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7.tar southamptonuniversitymap-c2b3891c783dee1b4ef6fd70432aa7ef5e55c0d7.tar.gz | |
Merge branch 'dev-search' into dev
Conflicts:
gen/net/cbaines/suma/R.java
res/values/strings.xml
src/net/cbaines/suma/DataManager.java
src/net/cbaines/suma/MapActivity.java
src/net/cbaines/suma/POI.java
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fa7f1c1..f5ad217 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -5,7 +5,7 @@ android:versionName="0.8 (alpha)" > <uses-sdk - android:minSdkVersion="7" + android:minSdkVersion="8" android:targetSdkVersion="10" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> @@ -22,7 +22,6 @@ android:smallScreens="true" /> <application - android:debuggable="true" android:icon="@drawable/icon" android:label="@string/app_name" > <activity @@ -51,8 +50,18 @@ <data android:scheme="geo" /> </intent-filter> + <intent-filter> + <action android:name="android.intent.action.SEARCH" /> + </intent-filter> </activity> - <activity android:name="FindActivity" > + <activity android:name=".SearchActivity" > + <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" > @@ -156,6 +165,11 @@ 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" /> </application> </manifest>
\ No newline at end of file |