/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/Merge.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

src/org/waxworlds/importcontacts/Merge.java
21
21
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
22
 */
23
23
 
24
 
package org.waxworlds.edam.importcontacts;
 
24
package org.waxworlds.importcontacts;
25
25
 
26
26
import android.content.SharedPreferences;
27
27
import android.os.Bundle;
35
35
                setContentView( R.layout.merge );
36
36
                super.onCreate( savedInstanceState );
37
37
 
38
 
                setNextActivity( Doit.class );
 
38
                setNextState( ImportContacts.STATE_DOIT );
39
39
        }
40
40
 
41
41
        @Override