/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
6
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
 
 * to as "this program").  For more information, see
 
9
 * to as "this program"). For more information, see
10
10
 * http://ed.am/dev/android/import-contacts
11
11
 *
12
12
 * This program is free software: you can redistribute it and/or modify
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
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" android:paddingLeft="10dp" android:paddingRight="10dp" android:paddingTop="6dp" android:paddingBottom="6dp">
 
29
                <LinearLayout android:layout_height="fill_parent" android:orientation="vertical" android:layout_width="fill_parent">
30
30
 
31
31
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/merge_title" android:textAppearance="?android:attr/textAppearanceMedium"/>
32
32
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/merge_help" />