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

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

Issue 2511713002: Implement Android key/value backup (Closed)
Patch Set: 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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 {% block extra_keyset_definitions %} 104 {% block extra_keyset_definitions %}
105 {% endblock %} 105 {% endblock %}
106 106
107 <!-- Set android:largeHeap to "true" to allow more than the default 107 <!-- Set android:largeHeap to "true" to allow more than the default
108 Java heap limit (32Mb on Nexus S, 48Mb on Xoom). --> 108 Java heap limit (32Mb on Nexus S, 48Mb on Xoom). -->
109 <application android:name="{% block application_name %}org.chromium.chrome.b rowser.ChromeApplication{% endblock %}" 109 <application android:name="{% block application_name %}org.chromium.chrome.b rowser.ChromeApplication{% endblock %}"
110 android:icon="@mipmap/app_icon" 110 android:icon="@mipmap/app_icon"
111 android:label="@string/app_name" 111 android:label="@string/app_name"
112 android:largeHeap="false" 112 android:largeHeap="false"
113 android:allowBackup="false"
114 android:manageSpaceActivity="@string/manage_space_activity" 113 android:manageSpaceActivity="@string/manage_space_activity"
115 android:fullBackupContent="@xml/chromebackupscheme" 114 android:supportsRtl="true"
115 {% if backup_key is defined %}
116 android:allowBackup="true"
117 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent"
116 android:fullBackupOnly="false" 118 android:fullBackupOnly="false"
117 android:restoreAnyVersion="true" 119 android:restoreAnyVersion="true"
118 {% block android_backup_agent %} 120 {% else %}
119 android:backupAgent="org.chromium.chrome.browser.ChromeBackupAgent" 121 android:allowBackup="false"
120 {% endblock %} 122 {% endif %}
121 android:supportsRtl="true"
122 {% if target_sdk_version|int >= 24 %} 123 {% if target_sdk_version|int >= 24 %}
123 android:networkSecurityConfig="@xml/network_security_config" 124 android:networkSecurityConfig="@xml/network_security_config"
124 {% endif %} 125 {% endif %}
125 {% block extra_application_attributes %}{% endblock %}> 126 {% block extra_application_attributes %}{% endblock %}>
126 127
127 <!-- Samsung MultiWindow Support --> 128 <!-- Samsung MultiWindow Support -->
128 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable" 129 <meta-data android:name="com.samsung.android.sdk.multiwindow.enable"
129 android:value="true" /> 130 android:value="true" />
130 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable" 131 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.enable"
131 android:value="true" /> 132 android:value="true" />
132 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode" 133 <meta-data android:name="com.samsung.android.sdk.multiwindow.multiinstan ce.launchmode"
133 android:value="singleTask" /> 134 android:value="singleTask" />
134 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable" 135 <meta-data android:name="com.samsung.android.sdk.multiwindow.penwindow.e nable"
135 android:value="true"/> 136 android:value="true"/>
136 137
138 {% if backup_key is defined %}
139 <!-- Backup keys are channel dependent -->
140 <meta-data android:name="com.google.android.backup.api_key"
141 android:value="{{ backup_key }}" />
142 {% endif %}
143
137 {% if channel in ['dev', 'canary', 'default'] %} 144 {% if channel in ['dev', 'canary', 'default'] %}
138 <meta-data android:name="com.sec.android.support.multiwindow" android:va lue="true" /> 145 <meta-data android:name="com.sec.android.support.multiwindow" android:va lue="true" />
139 {% endif %} 146 {% endif %}
140 <meta-data android:name="android.content.APP_RESTRICTIONS" 147 <meta-data android:name="android.content.APP_RESTRICTIONS"
141 android:resource="@xml/app_restrictions"/> 148 android:resource="@xml/app_restrictions"/>
142 149
143 <!-- Note: All activities directly or indirectly derived from ChromeActi vity 150 <!-- Note: All activities directly or indirectly derived from ChromeActi vity
144 must specify android:hardwareAccelerated="false". 151 must specify android:hardwareAccelerated="false".
145 152
146 Since this activity (shown in the launcher) and the application 153 Since this activity (shown in the launcher) and the application
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 917 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
911 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 918 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
912 The downstream manifest replaces this block, and hence replaces the list of media route 919 The downstream manifest replaces this block, and hence replaces the list of media route
913 controllers with its own list. --> 920 controllers with its own list. -->
914 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 921 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
915 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 922 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
916 923
917 {% endblock %} 924 {% endblock %}
918 </application> 925 </application>
919 </manifest> 926 </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