diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-03-02 11:24:57 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-02 11:24:57 +0000 |
| commit | 7874813b4b682c34f709bf7a465baa8407b2a00f (patch) | |
| tree | 115ed1b33806e139b87a93cedbc564fa41135206 /res/layout/bus_activity.xml | |
| parent | f58d7d1fc227ed7de50ef5d48a49ff6709f3197b (diff) | |
| parent | e3be46bdee08ad5b336e143861790b705defc0bc (diff) | |
| download | southamptonuniversitymap-7874813b4b682c34f709bf7a465baa8407b2a00f.tar southamptonuniversitymap-7874813b4b682c34f709bf7a465baa8407b2a00f.tar.gz | |
Merge branch 'dev'
Conflicts:
gen/net/cbaines/suma/R.java
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/BusStopSpecificStopView.java
src/net/cbaines/suma/MapActivity.java
Diffstat (limited to 'res/layout/bus_activity.xml')
| -rw-r--r-- | res/layout/bus_activity.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/res/layout/bus_activity.xml b/res/layout/bus_activity.xml index f8bbe59..d8b26f6 100644 --- a/res/layout/bus_activity.xml +++ b/res/layout/bus_activity.xml @@ -14,11 +14,17 @@ <TextView android:id="@+id/busActivityBusID" - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" /> </LinearLayout> + <TextView + android:id="@+id/busActivityBusDestination" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLarge" /> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/busActivityContentLayout" |