/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: 2010-10-28 15:49:21 UTC
  • Revision ID: edam@waxworlds.org-20101028154921-98svlxlpno3cpzb8
- added file chooser
- changed file/dir entry box for a button that opens the file chooser
- added dialog to ask if you want to select a dir to scan or a file
- fixed bug where you could abort as dialog opened and the dialog wasn't cancelled
- fixed crash where you could abort as the merge prompt opened and it would try to use the just-destroyed importer
- fixed bug where closing the application at the end would show "aborted!" erroniously

Show diffs side-by-side

added added

removed removed

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