diff options
| author | Jeff Hamilton <jham@android.com> | 2011-06-17 14:31:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-17 14:31:01 -0700 |
| commit | 61a8e3508d8c9a885b9b064f70a4ce23b698d372 (patch) | |
| tree | eec4dae4ccc608659d3b6534120814647ddcd24a /AndroidManifest.xml | |
| parent | 90ee0619c5befc888569bbda46ad12dd3af2baa6 (diff) | |
| parent | fd77aaaa6b1b79ba0438a78e357aa877552830b1 (diff) | |
| download | packages_apps_browser-61a8e3508d8c9a885b9b064f70a4ce23b698d372.zip packages_apps_browser-61a8e3508d8c9a885b9b064f70a4ce23b698d372.tar.gz packages_apps_browser-61a8e3508d8c9a885b9b064f70a4ce23b698d372.tar.bz2 | |
Merge "Launch into browser when a URL is received over NFC."
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9751f96..51cf430 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -103,6 +103,13 @@ <data android:scheme="file" /> <data android:mimeType="application/x-webarchive-xml"/> </intent-filter> + <!-- Accept inbound NFC URLs at a low priority --> + <intent-filter android:priority="-101"> + <action android:name="android.nfc.action.NDEF_DISCOVERED" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:scheme="http" /> + <data android:scheme="https" /> + </intent-filter> <!-- We are also the main entry point of the browser. --> <intent-filter> <action android:name="android.intent.action.MAIN" /> |