/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-07-04 14:44:48 UTC
  • Revision ID: edam@waxworlds.org-20100704144448-1m30v811opup20fs
- got rid of the pretend ImportContacts activity alltogether (and made the Intro activity the startup one)
- massively simplified the WizzardActivity class so it works propperly
- moved all code to org.waxworlds.edam
- added an "aborted" message when the importion is aborted
- simplified the 3 actions the worker thread can take when stopping (only 2 were actualy used) to "aborted" or "alldone"
- changed intro message to match website
- bugfix: don't blow up when the My Contacts group is missing

Show diffs side-by-side

added added

removed removed

Lines of Context:
res/layout/configure_vcf.xml
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
34
 
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" />
 
35
                        <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="@string/vcf_location" />
 
36
                        <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal">
 
37
                                <EditText android:id="@+id/location" android:layout_height="wrap_content" android:layout_weight="1" android:layout_width="wrap_content" android:singleLine="true"/>
 
38
                        </LinearLayout>
37
39
 
38
40
                </LinearLayout>
39
41
        </ScrollView>