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-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
- 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
- files added:
- gen/org/waxworlds/edam
- src/org/waxworlds/edam
- files removed:
- src/org/waxworlds/importcontacts/ImportContacts.java
- files renamed:
- gen/org/waxworlds/importcontacts/ => gen/org/waxworlds/edam/importcontacts/
- src/org/waxworlds/importcontacts/ => src/org/waxworlds/edam/importcontacts/
- files modified:
- AndroidManifest.xml
added
removed
res/layout/mergeprompt.xml
