bzr branch
http://bzr.ed.am/android/import-contacts
|
1
by edam
Initial import |
1 |
<?xml version="1.0" encoding="utf-8"?> |
|
6
by edam
- added GPL header comments to all files |
2 |
|
3 |
<!-- |
|
4 |
* merge.xml |
|
5 |
* |
|
|
50
by edam
updated all URLs, email addresses and package names to ed.am |
6 |
* Copyright (C) 2009 Tim Marston <tim@ed.am> |
|
6
by edam
- added GPL header comments to all files |
7 |
* |
8 |
* This file is part of the Import Contacts program (hereafter referred |
|
|
94
by Tim Marston
minor style tweaks |
9 |
* to as "this program"). For more information, see |
|
50
by edam
updated all URLs, email addresses and package names to ed.am |
10 |
* http://ed.am/dev/android/import-contacts |
|
6
by edam
- added GPL header comments to all files |
11 |
* |
12 |
* This program is free software: you can redistribute it and/or modify |
|
13 |
* it under the terms of the GNU General Public License as published by |
|
14 |
* the Free Software Foundation, either version 3 of the License, or |
|
15 |
* (at your option) any later version. |
|
16 |
* |
|
17 |
* This program is distributed in the hope that it will be useful, |
|
18 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
19 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
20 |
* GNU General Public License for more details. |
|
21 |
* |
|
22 |
* You should have received a copy of the GNU General Public License |
|
23 |
* along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
|
14
by edam
- got rid of the pretend ImportContacts activity alltogether (and made the Intro activity the startup one) |
24 |
--> |
|
6
by edam
- added GPL header comments to all files |
25 |
|
|
1
by edam
Initial import |
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 |
||
|
106
by Tim Marston
fixed some lint warnings |
28 |
<ScrollView android:layout_width="fill_parent" android:layout_height="0dip" android:layout_weight="1" > |
29 |
<LinearLayout android:layout_height="wrap_content" android:orientation="vertical" android:layout_width="fill_parent" android:paddingLeft="10dp" android:paddingRight="10dp" android:paddingTop="6dp" android:paddingBottom="6dp"> |
|
|
9
by edam
- added scroll view to all layouts |
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> |
|
|
1
by edam
Initial import |
44 |
|
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"> |
|
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"/> |
|
47 |
<Button android:id="@+id/next" android:text="@string/next" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_weight="1" android:enabled="false"/> |
|
48 |
</LinearLayout> |
|
49 |
||
50 |
</LinearLayout> |