/android/import-contacts

To get this branch, use:
bzr branch http://bzr.ed.am/android/import-contacts

« back to all changes in this revision

Viewing changes to res/layout/doit.xml

  • Committer: edam
  • Date: 2009-01-28 19:55:17 UTC
  • Revision ID: edam@waxworlds.org-20090128195517-z1rmmys8tc8zvgqe
- made behaviour of next button overridable
- added abort button to merge prompt
- moved begin and close buttons to the next button, iverriding its behaviour
- added abort button to import and wired it up
- bugfix: tmp-progress bar didn't fill up when progress max was changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/layout/doit.xml
25
25
 
26
26
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent">
27
27
 
28
 
        <LinearLayout android:layout_height="wrap_content" android:orientation="vertical" android:layout_weight="1" android:layout_width="fill_parent">
29
 
 
30
 
                <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_title" android:textAppearance="?android:attr/textAppearanceMedium" />
31
 
                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="20dp"/>
32
 
 
33
 
                <LinearLayout android:id="@+id/doit_page_1" android:layout_height="wrap_content" android:layout_width="fill_parent" android:orientation="vertical">
34
 
 
35
 
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_ready" />
36
 
 
37
 
                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
38
 
                        <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:weightSum="3">
39
 
                                <Button android:text="@string/doit_begin" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:id="@+id/doit_begin" />
 
28
        <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1" >
 
29
                <LinearLayout android:layout_height="fill_parent" android:orientation="vertical" android:layout_width="fill_parent">
 
30
 
 
31
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_title" android:textAppearance="?android:attr/textAppearanceMedium" />
 
32
                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="20dp"/>
 
33
 
 
34
                        <LinearLayout android:id="@+id/doit_page_1" android:layout_height="wrap_content" android:layout_width="fill_parent" android:orientation="vertical">
 
35
 
 
36
                                <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_ready" />
 
37
 
40
38
                        </LinearLayout>
41
39
 
42
 
                </LinearLayout>
43
 
 
44
 
                <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/doit_page_2" android:layout_marginLeft="10dp" android:layout_marginRight="10dp">
45
 
 
46
 
                        <ProgressBar android:id="@+id/doit_progress" style="?android:attr/progressBarStyleHorizontal" android:layout_height="wrap_content" android:layout_width="fill_parent" />
47
 
                        <TextView android:id="@+id/doit_percentage" android:layout_below="@id/doit_progress" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
48
 
                        <TextView android:id="@+id/doit_outof" android:layout_below="@id/doit_progress" android:layout_alignRight="@id/doit_progress" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
49
 
 
50
 
                        <LinearLayout android:layout_below="@id/doit_percentage" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
51
 
                                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
52
 
 
53
 
                                <TableLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
54
 
                                        <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
55
 
                                                <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_creates" />
56
 
                                                <TextView android:id="@+id/doit_creates" android:layout_width="wrap_content" android:layout_height="wrap_content" />
57
 
                                        </TableRow>
58
 
                                        <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
59
 
                                                <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_overwrites" />
60
 
                                                <TextView android:id="@+id/doit_overwrites" android:layout_width="wrap_content" android:layout_height="wrap_content" />
61
 
                                        </TableRow>
62
 
                                        <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
63
 
                                                <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_merges" />
64
 
                                                <TextView android:id="@+id/doit_merges" android:layout_width="wrap_content" android:layout_height="wrap_content" />
65
 
                                        </TableRow>
66
 
                                        <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
67
 
                                                <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_skips" />
68
 
                                                <TextView android:id="@+id/doit_skips" android:layout_width="wrap_content" android:layout_height="wrap_content" />
69
 
                                        </TableRow>
70
 
                                </TableLayout>
71
 
 
72
 
                                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
73
 
 
74
 
                                <LinearLayout android:id="@+id/doit_closedisplay" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" android:visibility="gone" >
 
40
                        <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/doit_page_2" android:layout_marginLeft="10dp" android:layout_marginRight="10dp">
 
41
 
 
42
                                <ProgressBar android:id="@+id/doit_progress" style="?android:attr/progressBarStyleHorizontal" android:layout_height="wrap_content" android:layout_width="fill_parent" />
 
43
                                <TextView android:id="@+id/doit_percentage" android:layout_below="@id/doit_progress" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 
44
                                <TextView android:id="@+id/doit_outof" android:layout_below="@id/doit_progress" android:layout_alignRight="@id/doit_progress" android:layout_width="wrap_content" android:layout_height="wrap_content"/>
 
45
 
 
46
                                <LinearLayout android:layout_below="@id/doit_percentage" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
 
47
                                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
48
 
 
49
                                        <TableLayout android:layout_width="wrap_content" android:layout_height="wrap_content">
 
50
                                                <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
 
51
                                                        <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_creates" />
 
52
                                                        <TextView android:id="@+id/doit_creates" android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
53
                                                </TableRow>
 
54
                                                <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
 
55
                                                        <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_overwrites" />
 
56
                                                        <TextView android:id="@+id/doit_overwrites" android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
57
                                                </TableRow>
 
58
                                                <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
 
59
                                                        <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_merges" />
 
60
                                                        <TextView android:id="@+id/doit_merges" android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
61
                                                </TableRow>
 
62
                                                <TableRow android:layout_width="wrap_content" android:layout_height="wrap_content">
 
63
                                                        <TextView android:paddingRight="20dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/doit_skips" />
 
64
                                                        <TextView android:id="@+id/doit_skips" android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
65
                                                </TableRow>
 
66
                                        </TableLayout>
 
67
 
 
68
                                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
69
 
 
70
                                        <LinearLayout android:id="@+id/doit_abort_disp" android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:weightSum="3">
 
71
                                                <Button android:text="@string/abort" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:id="@+id/abort" />
 
72
                                        </LinearLayout>
 
73
 
75
74
                                        <TextView android:id="@+id/doit_alldone" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/doit_alldone" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMedium" android:paddingBottom="10dp" android:visibility="gone" />
76
 
                                        <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center" android:weightSum="3">
77
 
                                                <Button android:text="@string/doit_close" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:id="@+id/doit_close" />
78
 
                                        </LinearLayout>
 
75
 
79
76
                                </LinearLayout>
80
77
 
81
 
                        </LinearLayout>
82
 
 
83
 
                </RelativeLayout>
84
 
 
85
 
        </LinearLayout>
 
78
                        </RelativeLayout>
 
79
 
 
80
                </LinearLayout>
 
81
        </ScrollView>
86
82
 
87
83
        <LinearLayout android:orientation="horizontal" android:layout_height="wrap_content" android:layout_width="fill_parent" android:gravity="right" android:background="@android:drawable/bottom_bar" android:weightSum="3">
88
84
                <Button android:id="@+id/back" android:text="@string/back" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:enabled="false"/>