/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/configure_vcf.xml

  • Committer: edam
  • Date: 2011-06-04 16:52:28 UTC
  • Revision ID: edam@waxworlds.org-20110604165228-jam230oo29u1m06u
- properly handle multiple TYPE= params in one entry in a v3.0 vCard
- when deciding which phone number to use as the pimary number, a voice number takes precedence over a non-voice (fax or pager) number of the same standing in terms of being preferred or not.

Show diffs side-by-side

added added

removed removed

res/layout/configure_vcf.xml
31
31
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/vcf_title" android:textAppearance="?android:attr/textAppearanceMedium"/>
32
32
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/vcf_help"/>
33
33
                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
34
 
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/vcf_help2"/>
35
 
                        <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" />
36
34
 
37
 
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/vcf_location" />
38
 
                        <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal">
39
 
                                <EditText android:id="@+id/location" android:layout_height="wrap_content" android:layout_weight="1" android:layout_width="wrap_content" android:singleLine="true"/>
40
 
                        </LinearLayout>
 
35
                        <TextView android:id="@+id/location" android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="" />
 
36
                        <Button android:id="@+id/path" android:drawableLeft="@drawable/sdcard" android:drawableRight="@drawable/browse" android:drawablePadding="6dp" android:gravity="left|center_vertical" android:layout_width="fill_parent" android:layout_height="wrap_content" />
41
37
 
42
38
                </LinearLayout>
43
39
        </ScrollView>