diff options
| author | Jeff Hamilton <jham@android.com> | 2011-08-03 09:38:47 -0500 |
|---|---|---|
| committer | Jeff Hamilton <jham@android.com> | 2011-08-09 15:59:37 -0500 |
| commit | 1167da421b68952a590b050c32def7e0eff7cca6 (patch) | |
| tree | 9bc488fe65ebc8a41160a026891ee2a8d4fd23c1 /AndroidManifest.xml | |
| parent | 3572293500a7406813e61e6fedd63ca606debc19 (diff) | |
| download | packages_apps_Contacts-1167da421b68952a590b050c32def7e0eff7cca6.tar.gz packages_apps_Contacts-1167da421b68952a590b050c32def7e0eff7cca6.tar.bz2 packages_apps_Contacts-1167da421b68952a590b050c32def7e0eff7cca6.zip | |
Move the notification logic out to a listener
so there can be an Activity based version
of the listener as well for NFC VCARD imports.
Removed the now unused showImmediatley from
ImportRequest.
Change-Id: I37292676239444516bcc11486fc53e69b869dfa6
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0e28ae879..078bb2cde 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -599,17 +599,23 @@ android:configChanges="orientation|screenSize|keyboardHidden" android:theme="@style/BackgroundOnly"> <intent-filter> - <action android:name="android.nfc.action.NDEF_DISCOVERED" /> + <action android:name="android.intent.action.VIEW" /> + <data android:mimeType="text/directory" /> + <data android:mimeType="text/vcard" /> <data android:mimeType="text/x-vcard" /> <data android:mimeType="text/x-vCard" /> - <data android:mimeType="text/vcard" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + </activity> + + <activity android:name=".vcard.NfcImportVCardActivity" + android:configChanges="orientation|screenSize|keyboardHidden" + android:theme="@style/BackgroundOnly"> <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <data android:mimeType="text/directory" /> + <action android:name="android.nfc.action.NDEF_DISCOVERED" /> <data android:mimeType="text/vcard" /> <data android:mimeType="text/x-vcard" /> + <data android:mimeType="text/x-vCard" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> |