/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: 2012-12-21 14:51:26 UTC
  • Revision ID: tim@ed.am-20121221145126-l30l0yii8xkqs1m2
added a new class to VcardImporter, a ContentLine, which represents the data returned by the ContentLineIterator (including whether the next line looks folded, and the ability to generate/cache a US-ASCII String of the line)

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/layout/merge.xml
3
3
<!--
4
4
 * merge.xml
5
5
 *
6
 
 * Copyright (C) 2009 Tim Marston <edam@waxworlds.org>
 
6
 * Copyright (C) 2009 Tim Marston <tim@ed.am>
7
7
 *
8
8
 * This file is part of the Import Contacts program (hereafter referred
9
9
 * to as "this program"). For more information, see
10
 
 * http://www.waxworlds.org/edam/software/android/import-contacts
 
10
 * http://ed.am/dev/android/import-contacts
11
11
 *
12
12
 * This program is free software: you can redistribute it and/or modify
13
13
 * it under the terms of the GNU General Public License as published by
21
21
 *
22
22
 * You should have received a copy of the GNU General Public License
23
23
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
24
 
 -->
 
24
-->
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/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>
 
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>
42
44
 
43
45
        <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">
44
46
                <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"/>