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

Show diffs side-by-side

added added

removed removed

Lines of Context:
AndroidManifest.xml
3
3
<!--
4
4
 * AndroidMenifest.xml
5
5
 *
6
 
 * Copyright (C) 2009 Tim Marston <tim@ed.am>
 
6
 * Copyright (C) 2009 Tim Marston <edam@waxworlds.org>
7
7
 *
8
8
 * This file is part of the Import Contacts program (hereafter referred
9
9
 * to as "this program"). For more information, see
10
 
 * http://ed.am/dev/android/import-contacts
 
10
 * http://www.waxworlds.org/edam/software/android/import-contacts
11
11
 *
12
12
 * This program is free software: you can redistribute it and/or modify
13
13
 * it under the terms of the GNU General Public License as published by
21
21
 *
22
22
 * You should have received a copy of the GNU General Public License
23
23
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
24
 
 *
25
 
-->
 
24
 *-->
26
25
 
27
26
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
28
 
                package="am.ed.importcontacts"
29
 
                android:versionCode="10302"
30
 
                android:versionName="1.3.2">
31
 
 
32
 
        <application android:icon="@drawable/icon"
33
 
                        android:label="@string/app_name">
34
 
 
 
27
        package="org.waxworlds.edam.importcontacts"
 
28
        android:versionCode="1"
 
29
        android:versionName="0.9.1">
 
30
        <application android:icon="@drawable/icon" android:label="@string/app_name">
35
31
                <activity android:name=".Intro"
36
 
                                android:label="@string/app_name"
37
 
                                android:configChanges="keyboardHidden|orientation">
 
32
                                android:label="@string/app_name">
38
33
                        <intent-filter>
39
34
                                <action android:name="android.intent.action.MAIN" />
40
35
                                <category android:name="android.intent.category.LAUNCHER" />
41
36
                        </intent-filter>
42
37
                </activity>
43
 
                <activity android:name=".ConfigureVCF"
44
 
                                android:configChanges="keyboardHidden|orientation" />
45
 
                <activity android:name=".Merge"
46
 
                                android:configChanges="keyboardHidden|orientation" />
47
 
                <activity android:name=".Doit"
48
 
                                android:configChanges="keyboardHidden|orientation" />
 
38
 
 
39
                <activity android:name=".ConfigureVCF"></activity>
 
40
                <activity android:name=".Merge"></activity>
 
41
                <activity android:name=".Doit"></activity>
49
42
 
50
43
        </application>
51
44
        <uses-sdk android:minSdkVersion="3" />