/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/R.java

  • Committer: edam
  • Date: 2009-01-11 12:58:54 UTC
  • Revision ID: edam@waxworlds.org-20090111125854-u8ofzso4jatk12me
- added "all done" message
- rewrote Importer.finish() to make the exit process more consistent
- moved Doit's message definitions to Doit
- ensure the importer is destroyed in Doit.onPause()
- only show the toaster popup if a) there is an importer to abort, and b) the abort actually did something (i.e., it's not already aborted)
- bugfix: added some checks for abortion to the Importer after wait()ing after a dialog. Importer.wake() now alsy does a notify() to break out of dialog waits.
- also, made Importer.checkAbort() protected, so it can be checked from specific importers as desired

Show diffs side-by-side

added added

removed removed

src/org/waxworlds/importcontacts/R.java
15
15
        public static final int icon=0x7f020001;
16
16
    }
17
17
    public static final class id {
18
 
        public static final int back=0x7f05000c;
 
18
        public static final int back=0x7f05000d;
 
19
        public static final int doit_alldone=0x7f05000b;
19
20
        public static final int doit_begin=0x7f050001;
20
 
        public static final int doit_close=0x7f05000b;
 
21
        public static final int doit_close=0x7f05000c;
21
22
        public static final int doit_closedisplay=0x7f05000a;
22
23
        public static final int doit_creates=0x7f050006;
23
24
        public static final int doit_merges=0x7f050008;
28
29
        public static final int doit_percentage=0x7f050004;
29
30
        public static final int doit_progress=0x7f050003;
30
31
        public static final int doit_skips=0x7f050009;
31
 
        public static final int location=0x7f05000e;
32
 
        public static final int merge_keep=0x7f050011;
33
 
        public static final int merge_merge=0x7f050012;
34
 
        public static final int merge_overwrite=0x7f050013;
35
 
        public static final int merge_prompt=0x7f050010;
36
 
        public static final int merge_setting=0x7f05000f;
37
 
        public static final int mergeprompt_always=0x7f050015;
38
 
        public static final int mergeprompt_name=0x7f050014;
39
 
        public static final int next=0x7f05000d;
 
32
        public static final int location=0x7f05000f;
 
33
        public static final int merge_keep=0x7f050012;
 
34
        public static final int merge_merge=0x7f050013;
 
35
        public static final int merge_overwrite=0x7f050014;
 
36
        public static final int merge_prompt=0x7f050011;
 
37
        public static final int merge_setting=0x7f050010;
 
38
        public static final int mergeprompt_always=0x7f050016;
 
39
        public static final int mergeprompt_name=0x7f050015;
 
40
        public static final int next=0x7f05000e;
40
41
    }
41
42
    public static final class layout {
42
43
        public static final int doit=0x7f030000;