diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
| commit | 40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d (patch) | |
| tree | b6a6fa2fdbb7009859ef0ca4616a8b9c59169440 /res/layout/bus_stop_dialog.xml | |
| parent | 4b4a5a0ebc7f285d7cdcfa1d72640dbc097bdbb2 (diff) | |
| parent | a02e8ae9eed3b2e3c105db19e84c27a0774172dd (diff) | |
| download | southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar.gz | |
Merge branch 'dev'
Conflicts:
AndroidManifest.xml
res/values/strings.xml
Diffstat (limited to 'res/layout/bus_stop_dialog.xml')
| -rw-r--r-- | res/layout/bus_stop_dialog.xml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/res/layout/bus_stop_dialog.xml b/res/layout/bus_stop_dialog.xml new file mode 100644 index 0000000..24148c6 --- /dev/null +++ b/res/layout/bus_stop_dialog.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/layout_root" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="horizontal" + android:padding="10dp" > + + <ListView + android:id="@+id/busStopListItems" + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + </ListView> + +</LinearLayout>
\ No newline at end of file |