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

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

Issue 2785373004: Remove BuildInfo#isGreaterThanN() (Closed)
Patch Set: Updates for network security config Created 3 years, 8 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 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 android:manageSpaceActivity="@string/manage_space_activity" 116 android:manageSpaceActivity="@string/manage_space_activity"
117 android:supportsRtl="true" 117 android:supportsRtl="true"
118 {% if backup_key is defined %} 118 {% if backup_key is defined %}
119 android:allowBackup="true" 119 android:allowBackup="true"
120 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent" 120 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
121 android:fullBackupOnly="false" 121 android:fullBackupOnly="false"
122 android:restoreAnyVersion="true" 122 android:restoreAnyVersion="true"
123 {% else %} 123 {% else %}
124 android:allowBackup="false" 124 android:allowBackup="false"
125 {% endif %} 125 {% endif %}
126 {% if target_sdk_version|int >= 24 or target_sdk_version == 'O' %}
127 android:networkSecurityConfig="@xml/network_security_config" 126 android:networkSecurityConfig="@xml/network_security_config"
128 {% endif %}
129 {% block extra_application_attributes %}{% endblock %}> 127 {% block extra_application_attributes %}{% endblock %}>
130 128
131 <!-- Samsung MultiWindow Support --> 129 <!-- Samsung MultiWindow Support -->
132 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" 130 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable"
133 android:value="true" /> 131 android:value="true" />
134 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable" 132 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable"
135 android:value="true" /> 133 android:value="true" />
136 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode" 134 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode"
137 android:value="singleTask" /> 135 android:value="singleTask" />
138 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable" 136 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 <data android:scheme="https" /> 249 <data android:scheme="https" />
252 </intent-filter> 250 </intent-filter>
253 <intent-filter> 251 <intent-filter>
254 <action android:name="android.intent.action.SEARCH" /> 252 <action android:name="android.intent.action.SEARCH" />
255 </intent-filter> 253 </intent-filter>
256 <intent-filter> 254 <intent-filter>
257 <action android:name="com.sec.android.airview.HOVER" /> 255 <action android:name="com.sec.android.airview.HOVER" />
258 </intent-filter> 256 </intent-filter>
259 <meta-data android:name="android.app.searchable" 257 <meta-data android:name="android.app.searchable"
260 android:resource="@xml/searchable" /> 258 android:resource="@xml/searchable" />
261 {% if target_sdk_version|int > 24 or target_sdk_version == 'O' %}
262 <meta-data android:name="android.app.shortcuts" 259 <meta-data android:name="android.app.shortcuts"
263 android:resource="@xml/launchershortcuts" /> 260 android:resource="@xml/launchershortcuts" />
264 {% endif %}
265 261
266 </activity-alias> 262 </activity-alias>
267 263
268 <activity android:name="org.chromium.chrome.browser.LauncherShortcutActi vity" 264 <activity android:name="org.chromium.chrome.browser.LauncherShortcutActi vity"
269 android:theme="@android:style/Theme.NoDisplay" 265 android:theme="@android:style/Theme.NoDisplay"
270 android:taskAffinity="" 266 android:taskAffinity=""
271 android:excludeFromRecents="true" 267 android:excludeFromRecents="true"
272 android:exported="false" /> 268 android:exported="false" />
273 269
274 <!-- Upgrade related --> 270 <!-- Upgrade related -->
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after
979 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 975 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
980 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 976 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
981 The downstream manifest replaces this block, and hence replaces the list of media route 977 The downstream manifest replaces this block, and hence replaces the list of media route
982 controllers with its own list. --> 978 controllers with its own list. -->
983 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 979 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
984 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 980 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
985 981
986 {% endblock %} 982 {% endblock %}
987 </application> 983 </application>
988 </manifest> 984 </manifest>
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698