diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-08 14:28:11 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-08 14:28:11 +0000 |
| commit | 2b70a4f77bc29afbe5e801ad2ffec89cdb84f6ae (patch) | |
| tree | dc31dfcb187ec7551a5f5dec33df585aab414d28 /res | |
| parent | 1bce569ea81a1033460a0f3ecac32b7a26a9107b (diff) | |
| parent | 2b1ff25e6c6422ee0e52fe1e8e59794002d92ce0 (diff) | |
| download | southamptonuniversitymap-2b70a4f77bc29afbe5e801ad2ffec89cdb84f6ae.tar southamptonuniversitymap-2b70a4f77bc29afbe5e801ad2ffec89cdb84f6ae.tar.gz | |
Merge branch 'dev-stop-movement' into dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/bus_stop_dialog.xml | 15 | ||||
| -rw-r--r-- | res/menu/stop_menu.xml | 8 |
2 files changed, 19 insertions, 4 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 diff --git a/res/menu/stop_menu.xml b/res/menu/stop_menu.xml index 408e536..c44efa2 100644 --- a/res/menu/stop_menu.xml +++ b/res/menu/stop_menu.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" > - <!--<item + <item android:id="@+id/menu_previous_stop" android:icon="@drawable/ic_menu_back" - android:title="@string/menu_previous_stop"/>--> + android:title="@string/menu_previous_stop"/> <item android:id="@+id/menu_refresh_stop" android:icon="@drawable/ic_menu_refresh" android:title="@string/menu_refresh_stop"/> - <!--<item + <item android:id="@+id/menu_next_stop" android:icon="@drawable/ic_menu_forward" - android:title="@string/menu_next_stop"/>--> + android:title="@string/menu_next_stop"/> </menu>
\ No newline at end of file |