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

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

Issue 1465363002: [Storage] Android - ManageSpace UI, Important Origins, and CBD Dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
« no previous file with comments | « no previous file | chrome/android/java/res/drawable/flush_footer_button.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 {% block extra_keyset_definitions %} 95 {% block extra_keyset_definitions %}
96 {% endblock %} 96 {% endblock %}
97 97
98 <!-- Set android:largeHeap to "true" to allow more than the default 98 <!-- Set android:largeHeap to "true" to allow more than the default
99 Java heap limit (32Mb on Nexus S, 48Mb on Xoom). --> 99 Java heap limit (32Mb on Nexus S, 48Mb on Xoom). -->
100 <application android:name="{% block application_name %}org.chromium.chrome.b rowser.ChromeApplication{% endblock %}" 100 <application android:name="{% block application_name %}org.chromium.chrome.b rowser.ChromeApplication{% endblock %}"
101 android:icon="@mipmap/app_icon" 101 android:icon="@mipmap/app_icon"
102 android:label="@string/app_name" 102 android:label="@string/app_name"
103 android:largeHeap="false" 103 android:largeHeap="false"
104 android:allowBackup="true" 104 android:allowBackup="true"
105 android:manageSpaceActivity="@string/manage_space_activity"
105 android:fullBackupContent="@xml/chromebackupscheme" 106 android:fullBackupContent="@xml/chromebackupscheme"
106 android:restoreAnyVersion="true" 107 android:restoreAnyVersion="true"
107 {% block android_backup_agent %} 108 {% block android_backup_agent %}
108 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent" 109 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
109 {% endblock %} 110 {% endblock %}
110 android:supportsRtl="true" 111 android:supportsRtl="true"
111 {% if target_sdk_version|int >= 24 %} 112 {% if target_sdk_version|int >= 24 %}
112 android:networkSecurityConfig="@xml/network_security_config" 113 android:networkSecurityConfig="@xml/network_security_config"
113 {% endif %} 114 {% endif %}
114 {% block extra_application_attributes %}{% endblock %}> 115 {% block extra_application_attributes %}{% endblock %}>
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity" 322 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity"
322 android:theme="@style/MainTheme" 323 android:theme="@style/MainTheme"
323 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 324 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
324 </activity> 325 </activity>
325 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 326 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
326 android:theme="@style/PreferencesTheme" 327 android:theme="@style/PreferencesTheme"
327 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 328 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
328 android:label="@string/preferences" 329 android:label="@string/preferences"
329 android:exported="false"> 330 android:exported="false">
330 </activity> 331 </activity>
332 <activity android:name="org.chromium.chrome.browser.preferences.website. ManageSpaceActivity"
333 android:theme="@style/PreferencesTheme"
334 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
335 android:label="@string/storage_management_activity_label"
336 android:exported="false">
337 </activity>
331 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 338 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
332 android:theme="@style/ThemeWithActionBar" 339 android:theme="@style/ThemeWithActionBar"
333 android:hardwareAccelerated="false" 340 android:hardwareAccelerated="false"
334 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 341 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
335 </activity> 342 </activity>
336 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity" 343 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity"
337 android:theme="@style/MainTheme" 344 android:theme="@style/MainTheme"
338 android:exported="true"> 345 android:exported="true">
339 </activity> 346 </activity>
340 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity" 347 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity"
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 838 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
832 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 839 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
833 The downstream manifest replaces this block, and hence replaces the list of media route 840 The downstream manifest replaces this block, and hence replaces the list of media route
834 controllers with its own list. --> 841 controllers with its own list. -->
835 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 842 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
836 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 843 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
837 844
838 {% endblock %} 845 {% endblock %}
839 </application> 846 </application>
840 </manifest> 847 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/drawable/flush_footer_button.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698