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

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: comments 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
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:fullBackupContent="@xml/chromebackupscheme" 105 android:fullBackupContent="@xml/chromebackupscheme"
106 {% block android_backup_agent %} 106 {% block android_backup_agent %}
107 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent" 107 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
108 {% endblock %} 108 {% endblock %}
109 android:supportsRtl="true" 109 android:supportsRtl="true"
110 android:manageSpaceActivity="@string/manage_space_activity"
110 {% block extra_application_attributes %}{% endblock %}> 111 {% block extra_application_attributes %}{% endblock %}>
111 112
112 <!-- Samsung MultiWindow Support --> 113 <!-- Samsung MultiWindow Support -->
113 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" 114 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable"
114 android:value="true" /> 115 android:value="true" />
115 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable" 116 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable"
116 android:value="true" /> 117 android:value="true" />
117 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode" 118 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode"
118 android:value="singleTask" /> 119 android:value="singleTask" />
119 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable" 120 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity" 317 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity"
317 android:theme="@style/MainTheme" 318 android:theme="@style/MainTheme"
318 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 319 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
319 </activity> 320 </activity>
320 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 321 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
321 android:theme="@style/PreferencesTheme" 322 android:theme="@style/PreferencesTheme"
322 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 323 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
323 android:label="@string/preferences" 324 android:label="@string/preferences"
324 android:exported="false"> 325 android:exported="false">
325 </activity> 326 </activity>
327 <activity android:name="org.chromium.chrome.browser.preferences.website. ManageSpaceActivity"
328 android:theme="@style/PreferencesTheme"
329 android:icon="@mipmap/app_icon"
Ted C 2016/06/09 23:43:19 you shouldn't need the icon as it is defined at th
dmurph 2016/06/10 23:52:05 Done.
330 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
331 android:label="@string/storage_management_activity_label"
332 android:exported="false">
333 </activity>
326 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 334 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
327 android:theme="@style/ThemeWithActionBar" 335 android:theme="@style/ThemeWithActionBar"
328 android:hardwareAccelerated="false" 336 android:hardwareAccelerated="false"
329 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 337 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
330 </activity> 338 </activity>
331 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity" 339 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity"
332 android:theme="@style/MainTheme" 340 android:theme="@style/MainTheme"
333 android:exported="true"> 341 android:exported="true">
334 </activity> 342 </activity>
335 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity" 343 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity"
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 834 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
827 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 835 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
828 The downstream manifest replaces this block, and hence replaces the list of media route 836 The downstream manifest replaces this block, and hence replaces the list of media route
829 controllers with its own list. --> 837 controllers with its own list. -->
830 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 838 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
831 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 839 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
832 840
833 {% endblock %} 841 {% endblock %}
834 </application> 842 </application>
835 </manifest> 843 </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