Merge branch 'dev'

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

1 files changed, 25 insertions, 17 deletions

diff --git a/res/layout/building_activity.xml b/res/layout/building_activity.xml
index 6ed937f..777ad0a 100644
--- a/res/layout/building_activity.xml
+++ b/res/layout/building_activity.xml
@@ -10,31 +10,39 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
+    <CheckBox
+        android:id="@+id/buildingActivityFavouriteCheckBox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/bustimes_favourite_checkbox_label" />
+
+    <ImageButton
+        android:id="@+id/buildingActivityImage"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:background="@null"
+        android:contentDescription="@string/buildingImageDescription" />
+
     <LinearLayout
-        android:id="@+id/linearLayout1"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/buildingActivityLoadBarLayout"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="fill_parent"
+        android:gravity="center"
+        android:orientation="vertical" >
 
-        <CheckBox
-            android:id="@+id/buildingActivityFavouriteCheckBox"
+        <ProgressBar
+            android:id="@+id/buildingActivityLoadBar"
+            style="?android:attr/progressBarStyleLarge"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/bustimes_favourite_checkbox_label" />
+            android:layout_height="wrap_content" />
 
         <TextView
-            android:id="@+id/buildingActivityID"
+            android:id="@+id/buildingActivityMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="5dp"
-            android:paddingRight="5dp"
-            android:textAppearance="?android:attr/textAppearanceSmall" />
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceLarge" />
     </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/buildingActivityImage"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="@null"
-        android:contentDescription="@string/buildingImageDescription" />
-
 </LinearLayout>
\ No newline at end of file