diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-28 22:27:49 +0000 |
| commit | cde3c08d7e9e486d7d1a795832ea1b767d96a4f3 (patch) | |
| tree | f1af1424ebf5cb3a548a7d73257723395dccb267 /res/layout/bus_activity.xml | |
| parent | 7e88b00e017bde16c12e6adb78883acf7b2ba575 (diff) | |
| parent | 5f2b8712079aeb5b7cee476b06b36013edac4fb3 (diff) | |
| download | southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar southamptonuniversitymap-cde3c08d7e9e486d7d1a795832ea1b767d96a4f3.tar.gz | |
Merge branch 'dev'
Conflicts:
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/StopView.java
Diffstat (limited to 'res/layout/bus_activity.xml')
| -rw-r--r-- | res/layout/bus_activity.xml | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/res/layout/bus_activity.xml b/res/layout/bus_activity.xml index 3037916..f8bbe59 100644 --- a/res/layout/bus_activity.xml +++ b/res/layout/bus_activity.xml @@ -17,61 +17,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" /> - - <TextView - android:id="@+id/busActivityU1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u1_back_selected" - android:paddingLeft="5dp" - android:paddingRight="5dp" - android:text="@string/U1" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="#FFFFFF" /> - - <TextView - android:id="@+id/busActivityU1N" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u1n_back_selected" - android:paddingLeft="5dp" - android:paddingRight="5dp" - android:text="@string/U1N" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="#FFFFFF" /> - - <TextView - android:id="@+id/busActivityU2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u2_back_selected" - android:paddingLeft="5dp" - android:paddingRight="5dp" - android:text="@string/U2" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="#FFFFFF" /> - - <TextView - android:id="@+id/busActivityU6" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u6_back_selected" - android:paddingLeft="5dp" - android:paddingRight="5dp" - android:text="@string/U6" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="#FFFFFF" /> - - <TextView - android:id="@+id/busActivityU9" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/u9_back_selected" - android:paddingLeft="5dp" - android:paddingRight="5dp" - android:text="@string/U9" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="#FFFFFF" /> </LinearLayout> <LinearLayout |