Merge branch 'dev'

Conflicts:
	src/net/cbaines/suma/BusSpecificStopView.java
	src/net/cbaines/suma/StopView.java

1 files changed, 116 insertions, 2 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c796a99..5e61dd4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="net.cbaines.suma"
-    android:versionCode="7"
-    android:versionName="0.4 (alpha)" >
+    android:versionCode="8"
+    android:versionName="0.5 (alpha)" >
 
     <uses-sdk android:minSdkVersion="7" />
 
@@ -13,6 +13,12 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true" />
+
     <application
         android:icon="@drawable/icon"
         android:label="@string/app_name" >
@@ -24,16 +30,124 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter android:label="@string/app_name" >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="opendatamap.ecs.soton.ac.uk"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name" >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="geo" />
+            </intent-filter>
         </activity>
         <activity android:name="FindActivity" >
         </activity>
         <activity android:name="BusStopActivity" >
+            <intent-filter android:label="@string/app_name" >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="id.southampton.ac.uk"
+                    android:pathPrefix="/bus-stop/"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name" >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="data.southampton.ac.uk"
+                    android:pathPrefix="/bus-stop/"
+                    android:scheme="http" />
+            </intent-filter>
         </activity>
         <activity android:name="BusActivity" >
+            <intent-filter android:label="@string/app_name" >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="id.southampton.ac.uk"
+                    android:pathPrefix="/bus/"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name" >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="data.southampton.ac.uk"
+                    android:pathPrefix="/bus/"
+                    android:scheme="http" />
+            </intent-filter>
         </activity>
         <activity android:name="AboutActivity" >
         </activity>
         <activity android:name="BuildingActivity" >
+            <intent-filter android:label="@string/app_name" >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="id.southampton.ac.uk"
+                    android:pathPrefix="/building/"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name" >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="data.southampton.ac.uk"
+                    android:pathPrefix="/building/"
+                    android:scheme="http" />
+            </intent-filter>
+        </activity>
+        <activity android:name="BusRouteActivity" >
+            <intent-filter android:label="@string/app_name" >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="id.southampton.ac.uk"
+                    android:pathPrefix="/bus-route/"
+                    android:scheme="http" />
+            </intent-filter>
+            <intent-filter android:label="@string/app_name" >
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="data.southampton.ac.uk"
+                    android:pathPrefix="/bus-route/"
+                    android:scheme="http" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".PreferencesActivity"