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

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

Issue 2496693002: Implement Android key/value backup (Closed)
Patch Set: More review comments Created 4 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
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgent.java » ('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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
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="@mipmap/app_icon" 112 android:icon="@mipmap/app_icon"
113 android:label="@string/app_name" 113 android:label="@string/app_name"
114 android:largeHeap="false" 114 android:largeHeap="false"
115 android:allowBackup="false"
116 android:manageSpaceActivity="@string/manage_space_activity" 115 android:manageSpaceActivity="@string/manage_space_activity"
117 android:fullBackupContent="@xml/chromebackupscheme" 116 android:supportsRtl="true"
117 {% if backup_key is defined %}
118 android:allowBackup="true"
119 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
118 android:fullBackupOnly="false" 120 android:fullBackupOnly="false"
119 android:restoreAnyVersion="true" 121 android:restoreAnyVersion="true"
120 {% block android_backup_agent %} 122 {% else %}
121 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent" 123 android:allowBackup="false"
122 {% endblock %} 124 {% endif %}
123 android:supportsRtl="true"
124 {% if target_sdk_version|int >= 24 %} 125 {% if target_sdk_version|int >= 24 %}
125 android:networkSecurityConfig="@xml/network_security_config" 126 android:networkSecurityConfig="@xml/network_security_config"
126 {% endif %} 127 {% endif %}
127 {% block extra_application_attributes %}{% endblock %}> 128 {% block extra_application_attributes %}{% endblock %}>
128 129
129 <!-- Samsung MultiWindow Support --> 130 <!-- Samsung MultiWindow Support -->
130 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" 131 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable"
131 android:value="true" /> 132 android:value="true" />
132 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable" 133 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable"
133 android:value="true" /> 134 android:value="true" />
134 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode" 135 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode"
135 android:value="singleTask" /> 136 android:value="singleTask" />
136 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable" 137 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable"
137 android:value="true"/> 138 android:value="true"/>
138 139
140 {% if backup_key is defined %}
141 <!-- Backup keys are channel dependent -->
142 <meta-data android:name="com.google.android.backup.api_key"
143 android:value="{{ backup_key }}" />
144 {% endif %}
145
139 {% if channel in ['dev', 'canary', 'default'] %} 146 {% if channel in ['dev', 'canary', 'default'] %}
140 <meta-data android:name="com.sec.android.support.multiwindow" android:va lue="true" /> 147 <meta-data android:name="com.sec.android.support.multiwindow" android:va lue="true" />
141 {% endif %} 148 {% endif %}
142 <meta-data android:name="android.content.APP_RESTRICTIONS" 149 <meta-data android:name="android.content.APP_RESTRICTIONS"
143 android:resource="@xml/app_restrictions"/> 150 android:resource="@xml/app_restrictions"/>
144 151
145 <!-- Note: All activities directly or indirectly derived from ChromeActi vity 152 <!-- Note: All activities directly or indirectly derived from ChromeActi vity
146 must specify android:hardwareAccelerated="false". 153 must specify android:hardwareAccelerated="false".
147 154
148 Since this activity (shown in the launcher) and the application 155 Since this activity (shown in the launcher) and the application
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
929 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 936 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
930 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 937 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
931 The downstream manifest replaces this block, and hence replaces the list of media route 938 The downstream manifest replaces this block, and hence replaces the list of media route
932 controllers with its own list. --> 939 controllers with its own list. -->
933 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 940 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
934 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 941 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
935 942
936 {% endblock %} 943 {% endblock %}
937 </application> 944 </application>
938 </manifest> 945 </manifest>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromeBackupAgent.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698