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_stop_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_stop_activity.xml')
-rw-r--r-- | res/layout/bus_stop_activity.xml | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/res/layout/bus_stop_activity.xml b/res/layout/bus_stop_activity.xml index 7875852..66da2f6 100644 --- a/res/layout/bus_stop_activity.xml +++ b/res/layout/bus_stop_activity.xml @@ -21,11 +21,12 @@ android:id="@+id/radio_u1" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginRight="2dp" android:background="@drawable/u1_radio_button" android:button="@drawable/empty" android:checked="true" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingLeft="3dp" + android:paddingRight="3dp" android:text="@string/U1" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#FFFFFF" /> @@ -34,11 +35,12 @@ android:id="@+id/radio_u1n" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginRight="2dp" android:background="@drawable/u1n_radio_button" android:button="@drawable/empty" android:checked="true" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingLeft="3dp" + android:paddingRight="3dp" android:text="@string/U1N" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#FFFFFF" /> @@ -47,11 +49,12 @@ android:id="@+id/radio_u2" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginRight="2dp" android:background="@drawable/u2_radio_button" android:button="@drawable/empty" android:checked="true" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingLeft="3dp" + android:paddingRight="3dp" android:text="@string/U2" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#FFFFFF" /> @@ -60,11 +63,12 @@ android:id="@+id/radio_u6" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginRight="2dp" android:background="@drawable/u6_radio_button" android:button="@drawable/empty" android:checked="true" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingLeft="3dp" + android:paddingRight="3dp" android:text="@string/U6" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#FFFFFF" /> @@ -73,11 +77,12 @@ android:id="@+id/radio_u9" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginRight="2dp" android:background="@drawable/u9_radio_button" android:button="@drawable/empty" android:checked="true" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingLeft="3dp" + android:paddingRight="3dp" android:text="@string/U9" android:textAppearance="?android:attr/textAppearanceMedium" android:textColor="#FFFFFF" /> @@ -86,6 +91,7 @@ android:id="@+id/favouriteCheckBox" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginRight="2dp" android:text="@string/bustimes_favourite_checkbox_label" android:textAppearance="?android:attr/textAppearanceMedium" /> @@ -93,8 +99,6 @@ android:id="@+id/busStopID" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingLeft="5dp" - android:paddingRight="5dp" android:textAppearance="?android:attr/textAppearanceSmall" android:visibility="gone" /> </LinearLayout> |