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

Side by Side Diff: chrome/android/java/AndroidManifest.xml

Issue 1989283002: Upstream: Launch WebApkActivity from WebAPK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Introduce WebApkActivity. Created 4 years, 6 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 <!-- 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 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 android:hardwareAccelerated="false" 403 android:hardwareAccelerated="false"
404 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}" 404 android:taskAffinity="{{ manifest_package }}.webapps.WebappActivity{ { i }}"
405 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 405 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
406 </activity> 406 </activity>
407 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}" 407 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web appActivity{{ i }}"
408 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}" 408 android:targetActivity="org.chromium.chrome.browser.webapps.WebappAc tivity{{ i }}"
409 android:icon="@mipmap/app_shortcut_icon" 409 android:icon="@mipmap/app_shortcut_icon"
410 android:label="@string/webapp_activity_title"> 410 android:label="@string/webapp_activity_title">
411 </activity-alias> 411 </activity-alias>
412 {% endfor %} 412 {% endfor %}
413 <!--
414 Activities for WebAPKs.
415 -->
416 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty"
417 android:theme="@style/WebappTheme"
418 android:label="@string/webapp_activity_title"
419 android:launchMode="singleTop"
420 android:documentLaunchMode="intoExisting"
421 android:windowSoftInputMode="adjustResize"
422 android:persistableMode="persistNever"
423 android:hardwareAccelerated="false"
424 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
425 </activity>
426 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web ApkActivity"
gone 2016/05/25 21:50:13 Don't need this alias.
Xi Han 2016/05/26 17:23:35 I thought the alias was for different channels of
gone 2016/05/26 18:20:36 You should only use an alias when an Activity's fi
427 android:targetActivity="org.chromium.chrome.browser.webapps.WebApkAc tivity"
428 android:label="@string/webapp_activity_title">
429 </activity-alias>
430 {% for i in range(10) %}
431 <activity android:name="org.chromium.chrome.browser.webapps.WebApkActivi ty{{ i }}"
432 android:theme="@style/WebappTheme"
433 android:icon="@mipmap/app_shortcut_icon"
434 android:label="@string/webapp_activity_title"
435 android:launchMode="singleTask"
436 android:windowSoftInputMode="adjustResize"
437 android:persistableMode="persistNever"
438 android:hardwareAccelerated="false"
439 android:taskAffinity="{{ manifest_package }}.webapps.WebApkActivity{ { i }}"
440 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
441 </activity>
442 <activity-alias android:name="com.google.android.apps.chrome.webapps.Web ApkActivity{{ i }}"
gone 2016/05/25 21:50:13 You don't need this alias; it's only necessary for
Xi Han 2016/05/26 17:23:36 Same question as above. WebApkActivity looks simil
443 android:targetActivity="org.chromium.chrome.browser.webapps.WebApkAc tivity{{ i }}"
444 android:icon="@mipmap/app_shortcut_icon"
445 android:label="@string/webapp_activity_title">
446 </activity-alias>
447 {% endfor %}
413 448
414 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity" 449 <activity android:name="org.chromium.chrome.browser.media.remote.Expande dControllerActivity"
415 android:theme="@style/MainTheme" 450 android:theme="@style/MainTheme"
416 android:label="Chrome.ExpandedControllerActivity" 451 android:label="Chrome.ExpandedControllerActivity"
417 android:hardwareAccelerated="true" 452 android:hardwareAccelerated="true"
418 android:launchMode="singleTask" 453 android:launchMode="singleTask"
419 android:noHistory="true" 454 android:noHistory="true"
420 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 455 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
421 android:excludeFromRecents="true"> 456 android:excludeFromRecents="true">
422 </activity> 457 </activity>
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 835 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
801 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 836 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
802 The downstream manifest replaces this block, and hence replaces the list of media route 837 The downstream manifest replaces this block, and hence replaces the list of media route
803 controllers with its own list. --> 838 controllers with its own list. -->
804 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 839 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
805 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 840 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
806 841
807 {% endblock %} 842 {% endblock %}
808 </application> 843 </application>
809 </manifest> 844 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698