Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 314 android:theme="@style/MainTheme" | 315 android:theme="@style/MainTheme" |
| 315 android:screenOrientation="portrait" | 316 android:screenOrientation="portrait" |
| 316 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> | 317 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> |
| 317 </activity> | 318 </activity> |
| 318 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" | 319 <activity android:name="org.chromium.chrome.browser.preferences.Preferen ces" |
| 319 android:theme="@style/PreferencesTheme" | 320 android:theme="@style/PreferencesTheme" |
| 320 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" | 321 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" |
| 321 android:label="@string/preferences" | 322 android:label="@string/preferences" |
| 322 android:exported="false"> | 323 android:exported="false"> |
| 323 </activity> | 324 </activity> |
| 325 <activity android:name="org.chromium.chrome.browser.preferences.website. ManageSpaceActivity" | |
| 326 android:theme="@style/PreferencesTheme" | |
| 327 android:icon="@mipmap/app_icon" | |
| 328 android:configChanges="smallestScreenSize|screenSize|orientation|key boardHidden|keyboard|screenSize|mcc|mnc" | |
|
Theresa
2016/05/03 00:04:27
nit: move smallestScreenSize|screenSize to the end
dmurph
2016/05/04 00:51:00
Done.
| |
| 329 android:label="@string/storage_management_activity_label" | |
| 330 android:exported="false"> | |
| 331 </activity> | |
| 324 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" | 332 <activity android:name="org.chromium.chrome.browser.EmbedContentViewActi vity" |
| 325 android:theme="@style/ThemeWithActionBar" | 333 android:theme="@style/ThemeWithActionBar" |
| 326 android:hardwareAccelerated="false" | 334 android:hardwareAccelerated="false" |
| 327 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> | 335 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> |
| 328 </activity> | 336 </activity> |
| 329 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity" | 337 <activity android:name="org.chromium.chrome.browser.prerender.PrerenderA PITestActivity" |
| 330 android:theme="@style/MainTheme" | 338 android:theme="@style/MainTheme" |
| 331 android:exported="true"> | 339 android:exported="true"> |
| 332 </activity> | 340 </activity> |
| 333 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity" | 341 <activity android:name="org.chromium.chrome.browser.bookmarks.BookmarkAc tivity" |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 806 choose the first MediaRouteController that can play it, so the orde r of the list can be important. | 814 choose the first MediaRouteController that can play it, so the orde r of the list can be important. |
| 807 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. | 815 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. |
| 808 The downstream manifest replaces this block, and hence replaces the list of media route | 816 The downstream manifest replaces this block, and hence replaces the list of media route |
| 809 controllers with its own list. --> | 817 controllers with its own list. --> |
| 810 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" | 818 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" |
| 811 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> | 819 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> |
| 812 | 820 |
| 813 {% endblock %} | 821 {% endblock %} |
| 814 </application> | 822 </application> |
| 815 </manifest> | 823 </manifest> |
| OLD | NEW |