/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-10-28 15:49:21 UTC
  • Revision ID: edam@waxworlds.org-20101028154921-98svlxlpno3cpzb8
- added file chooser
- changed file/dir entry box for a button that opens the file chooser
- added dialog to ask if you want to select a dir to scan or a file
- fixed bug where you could abort as dialog opened and the dialog wasn't cancelled
- fixed crash where you could abort as the merge prompt opened and it would try to use the just-destroyed importer
- fixed bug where closing the application at the end would show "aborted!" erroniously

Show diffs side-by-side

added added

removed removed

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
 
 * to as "this program").  For more information, see
10
 
 * http://ed.am/dev/android/import-contacts
 
9
 * to as "this program"). For more information, see
 
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
25
25
-->
26
26
 
27
27
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
28
 
                package="am.ed.importcontacts"
29
 
                android:versionCode="10304"
30
 
                android:versionName="1.3.4">
31
 
 
32
 
        <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="18" />
33
 
 
34
 
        <uses-permission android:name="android.permission.READ_CONTACTS" />
35
 
        <uses-permission android:name="android.permission.WRITE_CONTACTS" />
36
 
        <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
28
        package="org.waxworlds.edam.importcontacts"
 
29
        android:versionCode="1"
 
30
        android:versionName="1.0">
37
31
 
38
32
        <application android:icon="@drawable/icon"
39
 
                        android:label="@string/app_name">
 
33
                android:label="@string/app_name"
 
34
                android:debuggable="true">
40
35
 
41
36
                <activity android:name=".Intro"
42
 
                                android:label="@string/app_name"
43
 
                                android:configChanges="keyboardHidden|orientation">
 
37
                                android:label="@string/app_name">
44
38
                        <intent-filter>
45
39
                                <action android:name="android.intent.action.MAIN" />
46
40
                                <category android:name="android.intent.category.LAUNCHER" />
47
41
                        </intent-filter>
48
42
                </activity>
49
 
                <activity android:name=".ConfigureVCF"
50
 
                                android:configChanges="keyboardHidden|orientation" />
51
 
                <activity android:name=".Merge"
52
 
                                android:configChanges="keyboardHidden|orientation" />
53
 
                <activity android:name=".Doit"
54
 
                                android:configChanges="keyboardHidden|orientation" />
 
43
                <activity android:name=".ConfigureVCF"></activity>
 
44
                <activity android:name=".Merge"></activity>
 
45
                <activity android:name=".Doit"></activity>
55
46
 
56
47
        </application>
 
48
        <uses-sdk android:minSdkVersion="3" />
 
49
 
 
50
        <uses-permission android:name="android.permission.READ_CONTACTS" />
 
51
        <uses-permission android:name="android.permission.WRITE_CONTACTS" />
57
52
 
58
53
</manifest>