diff options
| author | Paul Miller <paulmiller@google.com> | 2015-07-24 18:20:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-24 18:20:58 +0000 |
| commit | 7af69b1b552b13da5941c35c430f3adaf4132875 (patch) | |
| tree | e85931ccb7064360a6b1b69a6338a9a244baedc3 | |
| parent | 02e0ea6b98bc96e52223c8d52589b32bd599f0b9 (diff) | |
| parent | 005e202cec29b94fbaf2767acf13d46ee102578d (diff) | |
| download | Browser2-7af69b1b552b13da5941c35c430f3adaf4132875.tar.gz | |
Merge "Add intent-filter with MIME types"marshmallow-dev
| -rw-r--r-- | AndroidManifest.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9394ffa..d313c81 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -56,6 +56,7 @@ <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> + <!-- Catch intents which do not specify a MIME type --> <intent-filter> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> @@ -63,6 +64,18 @@ <data android:scheme="http" /> <data android:scheme="https" /> </intent-filter> + <!-- Catch intents which do specify a MIME type --> + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.BROWSABLE" /> + <data android:scheme="http" /> + <data android:scheme="https" /> + <data android:mimeType="text/html"/> + <data android:mimeType="text/plain"/> + <data android:mimeType="application/xhtml+xml"/> + <data android:mimeType="application/vnd.wap.xhtml+xml"/> <!-- XHTML MP --> + </intent-filter> </activity> <activity android:name=".WebViewLayoutTestActivity" |