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/mergeprompt.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
- 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
- files added:
- NEWS
- gen
- gen/org
- gen/org/waxworlds
- gen/org/waxworlds/edam
- gen/org/waxworlds/edam/importcontacts
- src/org/waxworlds/edam
- files removed:
- src/org/waxworlds/importcontacts/ImportContacts.java
- files renamed:
- src/org/waxworlds/importcontacts/R.java => gen/org/waxworlds/edam/importcontacts/R.java
- res/layout/import_vcf.xml => res/layout/configure_vcf.xml
- src/org/waxworlds/importcontacts/ => src/org/waxworlds/edam/importcontacts/
- src/org/waxworlds/importcontacts/ImportVCF.java => src/org/waxworlds/edam/importcontacts/ConfigureVCF.java
- files modified:
- .classpath
added
removed
res/layout/mergeprompt.xml
