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

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: Android Java Hookup Created 4 years, 9 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 <uses-feature android:name="android.hardware.touchscreen" android:required=" false" /> 93 <uses-feature android:name="android.hardware.touchscreen" android:required=" false" />
94 94
95 <!-- Set android:largeHeap to "true" to allow more than the default 95 <!-- Set android:largeHeap to "true" to allow more than the default
96 Java heap limit (32Mb on Nexus S, 48Mb on Xoom). --> 96 Java heap limit (32Mb on Nexus S, 48Mb on Xoom). -->
97 <application android:name="{% block application_name %}org.chromium.chrome.b rowser.ChromeApplication{% endblock %}" 97 <application android:name="{% block application_name %}org.chromium.chrome.b rowser.ChromeApplication{% endblock %}"
98 android:icon="@mipmap/app_icon" 98 android:icon="@mipmap/app_icon"
99 android:label="@string/app_name" 99 android:label="@string/app_name"
100 android:largeHeap="false" 100 android:largeHeap="false"
101 android:allowBackup="false" 101 android:allowBackup="false"
102 android:supportsRtl="true" 102 android:supportsRtl="true"
103 android:manageSpaceActivity="@string/manage_space_activity"
103 {% block extra_application_attributes %}{% endblock %}> 104 {% block extra_application_attributes %}{% endblock %}>
104 105
105 <!-- Samsung MultiWindow Support --> 106 <!-- Samsung MultiWindow Support -->
106 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" 107 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable"
107 android:value="true" /> 108 android:value="true" />
108 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable" 109 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable"
109 android:value="true" /> 110 android:value="true" />
110 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode" 111 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode"
111 android:value="singleTask" /> 112 android:value="singleTask" />
112 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable" 113 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 android:launchMode="singleTop" 262 android:launchMode="singleTop"
262 android:windowSoftInputMode="stateHidden|adjustPan" 263 android:windowSoftInputMode="stateHidden|adjustPan"
263 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 264 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
264 </activity> 265 </activity>
265 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 266 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
266 android:theme="@style/PreferencesTheme" 267 android:theme="@style/PreferencesTheme"
267 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 268 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
268 android:label="@string/preferences" 269 android:label="@string/preferences"
269 android:exported="false"> 270 android:exported="false">
270 </activity> 271 </activity>
272 <activity android:name="org.chromium.chrome.browser.preferences.website. ManageSpaceActivity"
273 android:theme="@style/PreferencesTheme"
274 android:icon="@mipmap/app_icon"
275 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
276 android:label="@string/storage_management_activity_label"
277 android:exported="false">
278 </activity>
271 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 279 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
272 android:theme="@style/ThemeWithActionBar" 280 android:theme="@style/ThemeWithActionBar"
273 android:hardwareAccelerated="false" 281 android:hardwareAccelerated="false"
274 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 282 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
275 </activity> 283 </activity>
276 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity" 284 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity"
277 android:theme="@style/MainTheme" 285 android:theme="@style/MainTheme"
278 android:exported="true"> 286 android:exported="true">
279 </activity> 287 </activity>
280 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity" 288 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity"
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 765 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
758 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 766 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
759 The downstream manifest replaces this block, and hence replaces the list of media route 767 The downstream manifest replaces this block, and hence replaces the list of media route
760 controllers with its own list. --> 768 controllers with its own list. -->
761 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 769 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
762 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 770 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
763 771
764 {% endblock %} 772 {% endblock %}
765 </application> 773 </application>
766 </manifest> 774 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698