/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-06-04 13:16:20 UTC
  • Revision ID: edam@waxworlds.org-20110604131620-hean9j66r3f5i72h
- fix UTF-8 unencoding by default on v3.0 vCards
- proper unescaping of strings in v3.0 vCards (also works for v2.1, although the 2.1 specs don't mention it)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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="1.0">
 
28
                package="org.waxworlds.edam.importcontacts"
 
29
                android:versionCode="2"
 
30
                android:versionName="1.1">
31
31
 
32
32
        <application android:icon="@drawable/icon"
33
 
                android:label="@string/app_name"
34
 
                android:debuggable="true">
 
33
                        android:label="@string/app_name"
 
34
                        android:debuggable="true">
35
35
 
36
36
                <activity android:name=".Intro"
37
 
                                android:label="@string/app_name">
 
37
                                android:label="@string/app_name"
 
38
                                android:configChanges="keyboardHidden|orientation">
38
39
                        <intent-filter>
39
40
                                <action android:name="android.intent.action.MAIN" />
40
41
                                <category android:name="android.intent.category.LAUNCHER" />
41
42
                        </intent-filter>
42
43
                </activity>
43
 
                <activity android:name=".ConfigureVCF"></activity>
44
 
                <activity android:name=".Merge"></activity>
45
 
                <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" />
46
50
 
47
51
        </application>
48
52
        <uses-sdk android:minSdkVersion="3" />