/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 src/org/waxworlds/importcontacts/Intro.java

  • Committer: edam
  • Date: 2009-01-28 19:55:17 UTC
  • Revision ID: edam@waxworlds.org-20090128195517-z1rmmys8tc8zvgqe
- made behaviour of next button overridable
- added abort button to merge prompt
- moved begin and close buttons to the next button, iverriding its behaviour
- added abort button to import and wired it up
- bugfix: tmp-progress bar didn't fill up when progress max was changed

Show diffs side-by-side

added added

removed removed

38
38
                setContentView( R.layout.intro );
39
39
                super.onCreate( savedInstanceState );
40
40
 
41
 
                setNextState( ImportContacts.STATE_CONFIGURE_VCF );
 
41
                setNextState( ImportContacts.STATE_IMPORT_VCF );
42
42
 
43
43
                TextView link = (TextView)findViewById( R.id.intro_link );
44
44
                Linkify.addLinks( link, Pattern.compile( "The Import Contacts homepage" ),