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 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 538 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity" | 538 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity" |
| 539 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity" | 539 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity" |
| 540 android:label="@string/webapp_activity_title" | 540 android:label="@string/webapp_activity_title" |
| 541 {{ self.supports_video_persistence() }} > | 541 {{ self.supports_video_persistence() }} > |
| 542 </activity-alias> | 542 </activity-alias> |
| 543 {% for i in range(10) %} | 543 {% for i in range(10) %} |
| 544 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty{{ i }}" | 544 <activity android:name="org.chromium.chrome.browser.webapps.WebappActivi ty{{ i }}" |
| 545 android:theme="@style/WebappTheme" | 545 android:theme="@style/WebappTheme" |
| 546 android:icon="@mipmap/app_shortcut_icon" | 546 android:icon="@mipmap/app_shortcut_icon" |
| 547 android:label="@string/webapp_activity_title" | 547 android:label="@string/webapp_activity_title" |
| 548 android:launchMode="singleTask" | 548 android:launchMode="singleTask" |
|
Yaron
2017/03/23 15:29:53
Hmm, I worry that us deviating from this may lead
Xi Han
2017/03/23 21:07:42
I don't know why singleTask is just doesn't work f
| |
| 549 android:windowSoftInputMode="adjustResize" | 549 android:windowSoftInputMode="adjustResize" |
| 550 android:persistableMode="persistNever" | 550 android:persistableMode="persistNever" |
| 551 android:hardwareAccelerated="false" | 551 android:hardwareAccelerated="false" |
| 552 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}" | 552 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}" |
| 553 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" | 553 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" |
| 554 {{ self.supports_video_persistence() }} > | 554 {{ self.supports_video_persistence() }} > |
| 555 </activity> | 555 </activity> |
| 556 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" | 556 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" |
| 557 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" | 557 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" |
| 558 android:icon="@mipmap/app_shortcut_icon" | 558 android:icon="@mipmap/app_shortcut_icon" |
| 559 android:label="@string/webapp_activity_title"> | 559 android:label="@string/webapp_activity_title"> |
| 560 </activity-alias> | 560 </activity-alias> |
| 561 {% endfor %} | 561 {% endfor %} |
| 562 <!-- Activities for WebAPKs. --> | 562 <!-- Activities for WebAPKs. --> |
| 563 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty" | 563 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty" |
| 564 android:theme="@style/WebappTheme" | 564 android:theme="@style/WebappTheme" |
| 565 android:label="@string/webapp_activity_title" | 565 android:label="@string/webapp_activity_title" |
| 566 android:launchMode="singleTop" | 566 android:launchMode="singleTop" |
| 567 android:documentLaunchMode="intoExisting" | |
| 568 android:windowSoftInputMode="adjustResize" | 567 android:windowSoftInputMode="adjustResize" |
| 569 android:persistableMode="persistNever" | 568 android:persistableMode="persistNever" |
| 570 android:hardwareAccelerated="false" | 569 android:hardwareAccelerated="false" |
| 571 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" | 570 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" |
| 572 {{ self.supports_video_persistence() }} > | 571 {{ self.supports_video_persistence() }} > |
| 573 </activity> | 572 </activity> |
| 574 {% for i in range(10) %} | 573 {% for i in range(10) %} |
| 575 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}" | 574 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}" |
| 576 android:theme="@style/WebappTheme" | 575 android:theme="@style/WebappTheme" |
| 577 android:icon="@mipmap/app_shortcut_icon" | 576 android:icon="@mipmap/app_shortcut_icon" |
| 578 android:label="@string/webapp_activity_title" | 577 android:label="@string/webapp_activity_title" |
| 579 android:launchMode="singleTask" | 578 android:launchMode="singleTop" |
|
Ted C
2017/03/23 23:16:07
The assigner pretty strongly assumes a 1:1 relatio
Xi Han
2017/03/24 16:05:36
I think only a WebAPK will launch a WebApkAcitivit
| |
| 580 android:windowSoftInputMode="adjustResize" | 579 android:windowSoftInputMode="adjustResize" |
| 581 android:persistableMode="persistNever" | 580 android:persistableMode="persistNever" |
| 582 android:hardwareAccelerated="false" | 581 android:hardwareAccelerated="false" |
| 583 android:taskAffinity="{{ manifest_package }}.webapps.WebApkActivity{ { i }}" | 582 android:taskAffinity="{{ manifest_package }}.webapps.WebApkActivity{ { i }}" |
| 584 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" | 583 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" |
| 585 {{ self.supports_video_persistence() }} > | 584 {{ self.supports_video_persistence() }} > |
| 586 </activity> | 585 </activity> |
| 587 {% endfor %} | 586 {% endfor %} |
| 588 | 587 |
| 589 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity" | 588 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity" |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 967 choose the first MediaRouteController that can play it, so the orde r of the list can be important. | 966 choose the first MediaRouteController that can play it, so the orde r of the list can be important. |
| 968 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. | 967 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. |
| 969 The downstream manifest replaces this block, and hence replaces the list of media route | 968 The downstream manifest replaces this block, and hence replaces the list of media route |
| 970 controllers with its own list. --> | 969 controllers with its own list. --> |
| 971 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" | 970 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" |
| 972 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> | 971 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> |
| 973 | 972 |
| 974 {% endblock %} | 973 {% endblock %} |
| 975 </application> | 974 </application> |
| 976 </manifest> | 975 </manifest> |
| OLD | NEW |