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

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: Created 5 years, 1 month 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="org.chromium.chrome.browser.preferences.web site.StoragePreferenceActivity"
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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 <category android:name="android.intent.category.DEFAULT" /> 268 <category android:name="android.intent.category.DEFAULT" />
268 </intent-filter> 269 </intent-filter>
269 </activity> 270 </activity>
270 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity" 271 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity"
271 android:theme="@style/DialogWhenLarge" 272 android:theme="@style/DialogWhenLarge"
272 android:label="@string/fre_label" 273 android:label="@string/fre_label"
273 android:launchMode="singleTop" 274 android:launchMode="singleTop"
274 android:windowSoftInputMode="stateHidden|adjustPan" 275 android:windowSoftInputMode="stateHidden|adjustPan"
275 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 276 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
276 </activity> 277 </activity>
278 <activity android:name="org.chromium.chrome.browser.preferences.website. StoragePreferenceActivity"
newt (away) 2015/11/25 15:56:25 nit: I'd put this just below Preferences, since it
dmurph 2015/11/25 23:47:45 Done.
279 android:theme="@style/PreferencesTheme"
280 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
281 android:label="@string/preferences"
282 android:exported="false">
283 </activity>
277 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" 284 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces"
278 android:theme="@style/PreferencesTheme" 285 android:theme="@style/PreferencesTheme"
279 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc" 286 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"
280 android:label="@string/preferences" 287 android:label="@string/preferences"
281 android:exported="false"> 288 android:exported="false">
282 </activity> 289 </activity>
283 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" 290 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity"
284 android:theme="@style/ThemeWithActionBar" 291 android:theme="@style/ThemeWithActionBar"
285 android:hardwareAccelerated="false" 292 android:hardwareAccelerated="false"
286 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc"> 293 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc">
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 681 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
675 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 682 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
676 The downstream manifest replaces this block, and hence replaces the list of media route 683 The downstream manifest replaces this block, and hence replaces the list of media route
677 controllers with its own list. --> 684 controllers with its own list. -->
678 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 685 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
679 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 686 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
680 687
681 {% endblock %} 688 {% endblock %}
682 </application> 689 </application>
683 </manifest> 690 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698