diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-26 23:38:47 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-26 23:38:47 +0000 |
| commit | 7e88b00e017bde16c12e6adb78883acf7b2ba575 (patch) | |
| tree | 309018e9979f47195a9a463cdcceeff0fbca9ef1 /res/layout/building_activity.xml | |
| parent | cc3f1f19a6de034413a37dfebd922fb8c51888e1 (diff) | |
| parent | 9b09f1286a8a003f0d24f745f648748cd3c2f2e2 (diff) | |
| download | southamptonuniversitymap-7e88b00e017bde16c12e6adb78883acf7b2ba575.tar southamptonuniversitymap-7e88b00e017bde16c12e6adb78883acf7b2ba575.tar.gz | |
Merge branch 'dev'
Conflicts:
src/net/cbaines/suma/BusActivity.java
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/BusStopActivity.java
src/net/cbaines/suma/StopView.java
Diffstat (limited to 'res/layout/building_activity.xml')
| -rw-r--r-- | res/layout/building_activity.xml | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/res/layout/building_activity.xml b/res/layout/building_activity.xml new file mode 100644 index 0000000..6ed937f --- /dev/null +++ b/res/layout/building_activity.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <TextView + android:id="@+id/buildingActivityName" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <LinearLayout + android:id="@+id/linearLayout1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <CheckBox + android:id="@+id/buildingActivityFavouriteCheckBox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/bustimes_favourite_checkbox_label" /> + + <TextView + android:id="@+id/buildingActivityID" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="5dp" + android:paddingRight="5dp" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </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 |