/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/merge.xml

  • Committer: edam
  • Date: 2009-01-11 16:47:01 UTC
  • Revision ID: edam@waxworlds.org-20090111164701-tvnnv5axo6jd7ck0
- added GPL header comments to all files
- added GPLv3 to project as COPYING

Show diffs side-by-side

added added

removed removed

res/layout/merge.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
 
        <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/merge_title" android:textAppearance="?android:attr/textAppearanceMedium"/>
32
 
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/merge_help" />
33
 
                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
34
 
 
35
 
                        <RadioGroup android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_setting">
36
 
                                <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_prompt" android:text="@string/merge_prompt" />
37
 
                                <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_keep" android:text="@string/merge_keep" />
38
 
                                <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_merge" android:text="@string/merge_merge" />
39
 
                                <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_overwrite" android:text="@string/merge_overwrite" />
40
 
                        </RadioGroup>
41
 
 
42
 
                </LinearLayout>
43
 
        </ScrollView>
 
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/merge_title" android:textAppearance="?android:attr/textAppearanceMedium"/>
 
31
                <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/merge_help" />
 
32
                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
 
33
 
 
34
                <RadioGroup android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_setting">
 
35
                        <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_prompt" android:text="@string/merge_prompt" />
 
36
                        <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_keep" android:text="@string/merge_keep" />
 
37
                        <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_merge" android:text="@string/merge_merge" />
 
38
                        <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_overwrite" android:text="@string/merge_overwrite" />
 
39
                </RadioGroup>
 
40
 
 
41
        </LinearLayout>
44
42
 
45
43
        <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">
46
44
                <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"/>