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

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: whoops, forgot files Created 4 years, 7 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
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="false" 104 android:allowBackup="false"
105 android:supportsRtl="true" 105 android:supportsRtl="true"
106 android:manageSpaceActivity="@string/manage_space_activity"
106 {% block extra_application_attributes %}{% endblock %}> 107 {% block extra_application_attributes %}{% endblock %}>
107 108
108 <!-- Samsung MultiWindow Support --> 109 <!-- Samsung MultiWindow Support -->
109 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" 110 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable"
110 android:value="true" /> 111 android:value="true" />
111 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable" 112 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable"
112 android:value="true" /> 113 android:value="true" />
113 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode" 114 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode"
114 android:value="singleTask" /> 115 android:value="singleTask" />
115 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable" 116 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity" 313 <activity android:name="org.chromium.chrome.browser.signin.AccountSignin Activity"
313 android:theme="@style/MainTheme" 314 android:theme="@style/MainTheme"
314 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 315 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
315 </activity> 316 </activity>
316 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 317 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
317 android:theme="@style/PreferencesTheme" 318 android:theme="@style/PreferencesTheme"
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 android:label="@string/preferences" 320 android:label="@string/preferences"
320 android:exported="false"> 321 android:exported="false">
321 </activity> 322 </activity>
323 <activity android:name="org.chromium.chrome.browser.preferences.website. ManageSpaceActivity"
324 android:theme="@style/PreferencesTheme"
325 android:icon="@mipmap/app_icon"
326 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenSize|smallestScreenSize"
Theresa 2016/05/13 06:02:30 screenSize is included twice, screenLayout is miss
dmurph 2016/05/13 23:46:23 Huh, I could have sworn I fixed this haha.
327 android:label="@string/storage_management_activity_label"
328 android:exported="false">
329 </activity>
322 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 330 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
323 android:theme="@style/ThemeWithActionBar" 331 android:theme="@style/ThemeWithActionBar"
324 android:hardwareAccelerated="false" 332 android:hardwareAccelerated="false"
325 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 333 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
326 </activity> 334 </activity>
327 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity" 335 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity"
328 android:theme="@style/MainTheme" 336 android:theme="@style/MainTheme"
329 android:exported="true"> 337 android:exported="true">
330 </activity> 338 </activity>
331 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity" 339 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity"
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 807 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
800 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 808 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
801 The downstream manifest replaces this block, and hence replaces the list of media route 809 The downstream manifest replaces this block, and hence replaces the list of media route
802 controllers with its own list. --> 810 controllers with its own list. -->
803 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 811 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
804 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 812 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
805 813
806 {% endblock %} 814 {% endblock %}
807 </application> 815 </application>
808 </manifest> 816 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698