/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-04-24 11:46:29 UTC
  • Revision ID: tim@ed.am-20120424114629-0ibja9f6vyrz7iwn
fixed bad error_ok string and removed some redundant directories

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/layout/merge.xml
1
1
<?xml version="1.0" encoding="utf-8"?>
 
2
 
 
3
<!--
 
4
 * merge.xml
 
5
 *
 
6
 * Copyright (C) 2009 Tim Marston <tim@ed.am>
 
7
 *
 
8
 * This file is part of the Import Contacts program (hereafter referred
 
9
 * to as "this program"). For more information, see
 
10
 * http://ed.am/dev/android/import-contacts
 
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/>.
 
24
-->
 
25
 
2
26
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="fill_parent" android:layout_height="fill_parent">
3
27
 
4
 
        <LinearLayout android:layout_height="wrap_content" android:orientation="vertical" android:layout_weight="1" android:layout_width="fill_parent">
5
 
 
6
 
                <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/merge_title" android:textAppearance="?android:attr/textAppearanceMedium"/>
7
 
                <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/merge_help" />
8
 
                <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
9
 
 
10
 
                <RadioGroup android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_setting">
11
 
                        <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_prompt" android:text="@string/merge_prompt" />
12
 
                        <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_keep" android:text="@string/merge_keep" />
13
 
                        <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_merge" android:text="@string/merge_merge" />
14
 
                        <RadioButton android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/merge_overwrite" android:text="@string/merge_overwrite" />
15
 
                </RadioGroup>
16
 
 
17
 
        </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>
18
44
 
19
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">
20
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"/>