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

Side by Side Diff: chrome/android/java/AndroidManifest.xml

Issue 2850253003: [Android] Add android:roundIcon for adaptive icon support (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | chrome/android/java/res/values/ic_launcher_round_alias.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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 --> 103 -->
104 <uses-feature android:name="android.hardware.touchscreen" android:required=" false" /> 104 <uses-feature android:name="android.hardware.touchscreen" android:required=" false" />
105 105
106 {% block extra_keyset_definitions %} 106 {% block extra_keyset_definitions %}
107 {% endblock %} 107 {% endblock %}
108 108
109 <!-- Set android:largeHeap to "true" to allow more than the default 109 <!-- Set android:largeHeap to "true" to allow more than the default
110 Java heap limit (32Mb on Nexus S, 48Mb on Xoom). --> 110 Java heap limit (32Mb on Nexus S, 48Mb on Xoom). -->
111 <application android:name="{% block application_name %}org.chromium.chrome.b rowser.ChromeApplication{% endblock %}" 111 <application android:name="{% block application_name %}org.chromium.chrome.b rowser.ChromeApplication{% endblock %}"
112 android:icon="@drawable/ic_launcher" 112 android:icon="@drawable/ic_launcher"
113 android:roundIcon="@drawable/ic_launcher_round"
113 android:label="@string/app_name" 114 android:label="@string/app_name"
114 android:largeHeap="false" 115 android:largeHeap="false"
115 android:manageSpaceActivity="@string/manage_space_activity" 116 android:manageSpaceActivity="@string/manage_space_activity"
116 android:supportsRtl="true" 117 android:supportsRtl="true"
117 {% if backup_key is defined %} 118 {% if backup_key is defined %}
118 android:allowBackup="true" 119 android:allowBackup="true"
119 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent" 120 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
120 android:fullBackupOnly="false" 121 android:fullBackupOnly="false"
121 android:restoreAnyVersion="true" 122 android:restoreAnyVersion="true"
122 {% else %} 123 {% else %}
(...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 976 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
976 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 977 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
977 The downstream manifest replaces this block, and hence replaces the list of media route 978 The downstream manifest replaces this block, and hence replaces the list of media route
978 controllers with its own list. --> 979 controllers with its own list. -->
979 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 980 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
980 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 981 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
981 982
982 {% endblock %} 983 {% endblock %}
983 </application> 984 </application>
984 </manifest> 985 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/values/ic_launcher_round_alias.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698