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/view_child_row.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/view_child_row.xml')
| -rw-r--r-- | res/layout/view_child_row.xml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/res/layout/view_child_row.xml b/res/layout/view_child_row.xml index 687cbee..bd4b3d5 100644 --- a/res/layout/view_child_row.xml +++ b/res/layout/view_child_row.xml @@ -1,24 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:gravity="right" - android:orientation="horizontal" - android:paddingRight="10dp" > + android:paddingLeft="50dp" > <TextView android:id="@+id/childname" - android:layout_width="fill_parent" - android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_height="fill_parent" + android:layout_gravity="left" android:focusable="false" - android:paddingLeft="50dp" - android:textSize="17dp" /> + android:textSize="18dp" /> <CheckBox android:id="@+id/check1" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="fill_parent" android:layout_gravity="right" + android:layout_weight="1" android:focusable="false" android:gravity="right" /> |