Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 <!-- | 6 <!-- |
| 7 Note: This is a jinja2 template, processed at build time into the final manifest . | 7 Note: This is a jinja2 template, processed at build time into the final manifest . |
| 8 | 8 |
| 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden | 9 Blocks denoted with { % block some_name % }foo{ % endblock % } can be overridden |
| 10 by a child template that "extends" this file. | 10 by a child template that "extends" this file. |
| (...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 476 android:taskAffinity="" | 476 android:taskAffinity="" |
| 477 android:excludeFromRecents="true"> | 477 android:excludeFromRecents="true"> |
| 478 <intent-filter> | 478 <intent-filter> |
| 479 <action android:name="com.google.android.apps.chrome.webapps.Web appManager.ACTION_START_WEBAPP" /> | 479 <action android:name="com.google.android.apps.chrome.webapps.Web appManager.ACTION_START_WEBAPP" /> |
| 480 <category android:name="android.intent.category.DEFAULT" /> | 480 <category android:name="android.intent.category.DEFAULT" /> |
| 481 </intent-filter> | 481 </intent-filter> |
| 482 </activity> | 482 </activity> |
| 483 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appManager" | 483 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appManager" |
| 484 android:targetActivity="org.chromium.chrome.browser.webapps.WebappLa uncherActivity"> | 484 android:targetActivity="org.chromium.chrome.browser.webapps.WebappLa uncherActivity"> |
| 485 </activity-alias> | 485 </activity-alias> |
| 486 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty" | 486 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty" |
|
pkotwicz
2017/05/25 06:01:17
Don't you need to make WebappActivity also singleT
piotrs
2017/05/25 07:05:11
You're right, added!
| |
| 487 android:theme="@style/WebappTheme" | 487 android:theme="@style/WebappTheme" |
| 488 android:label="@string/webapp_activity_title" | 488 android:label="@string/webapp_activity_title" |
| 489 android:documentLaunchMode="intoExisting" | 489 android:documentLaunchMode="intoExisting" |
| 490 android:persistableMode="persistNever" | 490 android:persistableMode="persistNever" |
| 491 {{ self.supports_video_persistence() }} | 491 {{ self.supports_video_persistence() }} |
| 492 {{ self.chrome_activity_common() }}> | 492 {{ self.chrome_activity_common() }}> |
| 493 </activity> | 493 </activity> |
| 494 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity" | 494 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity" |
| 495 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity" | 495 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity" |
| 496 android:label="@string/webapp_activity_title" | 496 android:label="@string/webapp_activity_title" |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 510 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" | 510 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" |
| 511 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" | 511 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" |
| 512 android:icon="@mipmap/app_shortcut_icon" | 512 android:icon="@mipmap/app_shortcut_icon" |
| 513 android:label="@string/webapp_activity_title"> | 513 android:label="@string/webapp_activity_title"> |
| 514 </activity-alias> | 514 </activity-alias> |
| 515 {% endfor %} | 515 {% endfor %} |
| 516 <!-- Activities for WebAPKs. --> | 516 <!-- Activities for WebAPKs. --> |
| 517 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty" | 517 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty" |
| 518 android:theme="@style/WebappTheme" | 518 android:theme="@style/WebappTheme" |
| 519 android:label="@string/webapp_activity_title" | 519 android:label="@string/webapp_activity_title" |
| 520 android:launchMode="singleTop" | |
| 520 android:documentLaunchMode="intoExisting" | 521 android:documentLaunchMode="intoExisting" |
| 521 android:persistableMode="persistNever" | 522 android:persistableMode="persistNever" |
| 522 {{ self.supports_video_persistence() }} | 523 {{ self.supports_video_persistence() }} |
| 523 {{ self.chrome_activity_common() }}> | 524 {{ self.chrome_activity_common() }}> |
| 524 </activity> | 525 </activity> |
| 525 {% for i in range(10) %} | 526 {% for i in range(10) %} |
| 526 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}" | 527 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}" |
| 527 android:theme="@style/WebappTheme" | 528 android:theme="@style/WebappTheme" |
| 528 android:icon="@mipmap/app_shortcut_icon" | 529 android:icon="@mipmap/app_shortcut_icon" |
| 529 android:label="@string/webapp_activity_title" | 530 android:label="@string/webapp_activity_title" |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 999 choose the first MediaRouteController that can play it, so the orde r of the list can be important. | 1000 choose the first MediaRouteController that can play it, so the orde r of the list can be important. |
| 1000 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. | 1001 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. |
| 1001 The downstream manifest replaces this block, and hence replaces the list of media route | 1002 The downstream manifest replaces this block, and hence replaces the list of media route |
| 1002 controllers with its own list. --> | 1003 controllers with its own list. --> |
| 1003 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" | 1004 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" |
| 1004 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> | 1005 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> |
| 1005 | 1006 |
| 1006 {% endblock %} | 1007 {% endblock %} |
| 1007 </application> | 1008 </application> |
| 1008 </manifest> | 1009 </manifest> |
| OLD | NEW |