/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: 2011-05-30 15:33:01 UTC
  • Revision ID: edam@waxworlds.org-20110530153301-oor6ci9b3hf9clul
- refactored some code to do with how contacts are imported
- Vcards (and ContactData) instances now generate a CacheIdentifier when they are finalised so that ContactData instances that do not have enough information to identify them can be discovered then
- importContact() now calls the private method checkForDuplicate(), renamed from isImportRequired(), and return if it is not
- importContact() and checkForDuplicate() now use the ContactData's generated CacheIdentifier

Show diffs side-by-side

added added

removed removed

Lines of Context:
AndroidManifest.xml
25
25
-->
26
26
 
27
27
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
28
 
        package="org.waxworlds.edam.importcontacts"
29
 
        android:versionCode="1"
30
 
        android:versionName="0.9.1">
31
 
        <application android:icon="@drawable/icon" android:label="@string/app_name">
 
28
                package="org.waxworlds.edam.importcontacts"
 
29
                android:versionCode="2"
 
30
                android:versionName="1.1">
 
31
 
 
32
        <application android:icon="@drawable/icon"
 
33
                        android:label="@string/app_name"
 
34
                        android:debuggable="true">
 
35
 
32
36
                <activity android:name=".Intro"
33
 
                                android:label="@string/app_name">
 
37
                                android:label="@string/app_name"
 
38
                                android:configChanges="keyboardHidden|orientation">
34
39
                        <intent-filter>
35
40
                                <action android:name="android.intent.action.MAIN" />
36
41
                                <category android:name="android.intent.category.LAUNCHER" />
37
42
                        </intent-filter>
38
43
                </activity>
39
 
 
40
 
                <activity android:name=".ConfigureVCF"></activity>
41
 
                <activity android:name=".Merge"></activity>
42
 
                <activity android:name=".Doit"></activity>
 
44
                <activity android:name=".ConfigureVCF"
 
45
                                android:configChanges="keyboardHidden|orientation" />
 
46
                <activity android:name=".Merge"
 
47
                                android:configChanges="keyboardHidden|orientation" />
 
48
                <activity android:name=".Doit"
 
49
                                android:configChanges="keyboardHidden|orientation" />
43
50
 
44
51
        </application>
45
52
        <uses-sdk android:minSdkVersion="3" />