/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-13 06:35:26 UTC
  • Revision ID: edam@waxworlds.org-20090113063526-l9t1s9git4bav60a
- new contact's phone numebrs and email addresses are added to the caches after those contacts are updated to account for the situation where the same contact is imported again from another file (or the contact exists twice in the same file!?)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
        <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"/>