Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(207)

Side by Side Diff: chrome/android/webapk/shell_apk/AndroidManifest.xml

Issue 2956193002: [Android] Enable WebAPK to have multiple intent filters (Closed)
Patch Set: Merge branch 'rewriting0' into rewriting Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. 4 found in the LICENSE file.
5 --> 5 -->
6 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 6 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
7 xmlns:tools="http://schemas.android.com/tools" 7 xmlns:tools="http://schemas.android.com/tools"
8 package="{{{manifest_package}}}" 8 package="{{{manifest_package}}}"
9 android:versionCode="{{{version_code}}}" 9 android:versionCode="{{{version_code}}}"
10 android:versionName="{{{version_name}}}" > 10 android:versionName="{{{version_name}}}" >
11 11
12 <uses-sdk 12 <uses-sdk
13 android:minSdkVersion="16" 13 android:minSdkVersion="16"
14 android:targetSdkVersion="23" /> 14 android:targetSdkVersion="23" />
15 15
16 <application 16 <application
17 android:icon="@mipmap/app_icon" 17 android:icon="@mipmap/app_icon"
18 android:label="@string/short_name" 18 android:label="@string/short_name"
19 android:allowBackup="false"> 19 android:allowBackup="false">
20 <activity android:name="org.chromium.webapk.shell_apk.MainActivity" 20 <activity android:name="org.chromium.webapk.shell_apk.MainActivity"
21 android:theme="@android:style/Theme.Translucent.NoTitleBar" 21 android:theme="@android:style/Theme.Translucent.NoTitleBar"
22 android:excludeFromRecents="true"> 22 android:excludeFromRecents="true">
23 <intent-filter> 23 <intent-filter>
24 <action android:name="android.intent.action.MAIN" /> 24 <action android:name="android.intent.action.MAIN" />
25 <category android:name="android.intent.category.LAUNCHER" /> 25 <category android:name="android.intent.category.LAUNCHER" />
26 </intent-filter> 26 </intent-filter>
27 {{#intent_filters:intent_filters}}
Yaron 2017/06/28 16:55:40 I'm not familiar with this syntax but have you ver
hartmanng 2017/06/28 18:24:33 it doesn't as-is. The changes to make it work on t
Yaron 2017/06/28 18:28:47 Ya, those match my expectations. I would think tha
pkotwicz 2017/06/28 20:45:06 It doesn't. The server will have the process the A
hartmanng 2017/06/28 21:01:29 Just to be completely explicit here: the part of t
27 <intent-filter> 28 <intent-filter>
28 <action android:name="android.intent.action.VIEW"></action> 29 <action android:name="android.intent.action.VIEW"></action>
29 <category android:name="android.intent.category.DEFAULT"></categ ory> 30 <category android:name="android.intent.category.DEFAULT"></categ ory>
30 <category android:name="android.intent.category.BROWSABLE"></cat egory> 31 <category android:name="android.intent.category.BROWSABLE"></cat egory>
31 <data android:scheme="{{{scope_url_scheme}}}" android:host="{{{s cope_url_host}}}" android:pathPrefix="{{{scope_url_path}}}"></data> 32 <data android:scheme="{{{intent_filters.scope_url_scheme}}}" and roid:host="{{{intent_filters.scope_url_host}}}" android:pathPrefix="{{{intent_fi lters.scope_url_path}}}"></data>
32 </intent-filter> 33 </intent-filter>
34 {{/intent_filters}}
33 </activity> 35 </activity>
34 <meta-data android:name="org.chromium.webapk.shell_apk.shellApkVersion" android:value="{{{shell_apk_version}}}" /> 36 <meta-data android:name="org.chromium.webapk.shell_apk.shellApkVersion" android:value="{{{shell_apk_version}}}" />
35 {{#runtime_host}}<meta-data android:name="org.chromium.webapk.shell_apk. runtimeHost" android:value="{{{runtime_host}}}" />{{/runtime_host}} 37 {{#bound_webapk}}
36 {{#runtime_host_application_name}}<meta-data android:name="org.chromium. webapk.shell_apk.runtimeHostApplicationName" android:value="{{{runtime_host_appl ication_name}}}" />{{/runtime_host_application_name}} 38 <meta-data android:name="org.chromium.webapk.shell_apk.runtimeHost" andr oid:value="{{{runtime_host}}}" />
39 <meta-data android:name="org.chromium.webapk.shell_apk.runtimeHostApplic ationName" android:value="{{{runtime_host_application_name}}}" />
40 {{/bound_webapk}}
37 <meta-data android:name="org.chromium.webapk.shell_apk.startUrl" android :value="{{{start_url}}}" /> 41 <meta-data android:name="org.chromium.webapk.shell_apk.startUrl" android :value="{{{start_url}}}" />
38 <meta-data android:name="org.chromium.webapk.shell_apk.scope" android:va lue="{{{scope_url}}}" /> 42 <meta-data android:name="org.chromium.webapk.shell_apk.scope" android:va lue="{{{scope_url}}}" />
39 <meta-data android:name="org.chromium.webapk.shell_apk.displayMode" andr oid:value="{{{display_mode}}}" /> 43 <meta-data android:name="org.chromium.webapk.shell_apk.displayMode" andr oid:value="{{{display_mode}}}" />
40 <meta-data android:name="org.chromium.webapk.shell_apk.orientation" andr oid:value="{{{orientation}}}" /> 44 <meta-data android:name="org.chromium.webapk.shell_apk.orientation" andr oid:value="{{{orientation}}}" />
41 <meta-data android:name="org.chromium.webapk.shell_apk.themeColor" andro id:value="{{{theme_color}}}" /> 45 <meta-data android:name="org.chromium.webapk.shell_apk.themeColor" andro id:value="{{{theme_color}}}" />
42 <meta-data android:name="org.chromium.webapk.shell_apk.backgroundColor" android:value="{{{background_color}}}" /> 46 <meta-data android:name="org.chromium.webapk.shell_apk.backgroundColor" android:value="{{{background_color}}}" />
43 <meta-data android:name="org.chromium.webapk.shell_apk.iconId" android:r esource="@mipmap/app_icon" /> 47 <meta-data android:name="org.chromium.webapk.shell_apk.iconId" android:r esource="@mipmap/app_icon" />
48
49 <!-- Hashes of icons should be taken of the icons as they are available on the web. The icon
Yaron 2017/06/28 16:59:39 Use mustache comment {{! instaed
pkotwicz 2017/06/28 20:45:06 Done. Does Android keep XML comments when it cons
50 bytes should not be transformed (e.g. decoded / encoded) prior to t aking the hash.
51 -->
44 <meta-data android:name="org.chromium.webapk.shell_apk.iconUrlsAndIconMu rmur2Hashes" android:value="{{{icon_urls_and_icon_murmur2_hashes}}}" /> 52 <meta-data android:name="org.chromium.webapk.shell_apk.iconUrlsAndIconMu rmur2Hashes" android:value="{{{icon_urls_and_icon_murmur2_hashes}}}" />
53
45 <meta-data android:name="org.chromium.webapk.shell_apk.webManifestUrl" a ndroid:value="{{{web_manifest_url}}}" /> 54 <meta-data android:name="org.chromium.webapk.shell_apk.webManifestUrl" a ndroid:value="{{{web_manifest_url}}}" />
46 <service 55 <service
47 android:name="org.chromium.webapk.shell_apk.WebApkServiceFactory" 56 android:name="org.chromium.webapk.shell_apk.WebApkServiceFactory"
48 android:exported="true" 57 android:exported="true"
49 tools:ignore="ExportedService"> 58 tools:ignore="ExportedService">
50 <intent-filter> 59 <intent-filter>
51 <action android:name="android.intent.action.MAIN" /> 60 <action android:name="android.intent.action.MAIN" />
52 <category android:name="android.intent.category.WEBAPK_API" /> 61 <category android:name="android.intent.category.WEBAPK_API" />
53 </intent-filter> 62 </intent-filter>
54 </service> 63 </service>
(...skipping 11 matching lines...) Expand all
66 android:process=":webapk_sandboxed_process1" 75 android:process=":webapk_sandboxed_process1"
67 android:exported="true" 76 android:exported="true"
68 tools:ignore="ExportedService"/> 77 tools:ignore="ExportedService"/>
69 <service android:name="org.chromium.webapk.shell_apk.WebApkSandboxedProc essService2" 78 <service android:name="org.chromium.webapk.shell_apk.WebApkSandboxedProc essService2"
70 android:isolatedProcess="true" 79 android:isolatedProcess="true"
71 android:process=":webapk_sandboxed_process2" 80 android:process=":webapk_sandboxed_process2"
72 android:exported="true" 81 android:exported="true"
73 tools:ignore="ExportedService"/> 82 tools:ignore="ExportedService"/>
74 </application> 83 </application>
75 </manifest> 84 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698