/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 19:20:17 UTC
  • Revision ID: edam@waxworlds.org-20110530192017-5c09k4kgpov02gja
- added checks for Doit.this == null when handling dialog buttons (I managed to abort an import as a duplicate contacts dialog was shown, but can't reproduce it now)
- added line no.s to vcard parsing errors
- update progress bar after a contact is imported, not before
- fixed bug introduced in last commit where a contacts were imported after finaliseVcard()ing failed
- don't show unknown encoding errors for vcard fields that we don't care about (which ignores base64 encoded photos, for example)

Show diffs side-by-side

added added

removed removed

Lines of Context:
AndroidManifest.xml
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
 
 *-->
 
24
 *
 
25
-->
25
26
 
26
27
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
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">
 
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
 
31
36
                <activity android:name=".Intro"
32
 
                                android:label="@string/app_name">
 
37
                                android:label="@string/app_name"
 
38
                                android:configChanges="keyboardHidden|orientation">
33
39
                        <intent-filter>
34
40
                                <action android:name="android.intent.action.MAIN" />
35
41
                                <category android:name="android.intent.category.LAUNCHER" />
36
42
                        </intent-filter>
37
43
                </activity>
38
 
 
39
 
                <activity android:name=".ConfigureVCF"></activity>
40
 
                <activity android:name=".Merge"></activity>
41
 
                <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" />
42
50
 
43
51
        </application>
44
52
        <uses-sdk android:minSdkVersion="3" />