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

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

Issue 1817083003: Add pathway to auto-migrate users when Chrome launches (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@assassin
Patch Set: Return to fix incognito case Created 4 years, 9 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
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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 </intent-filter> 194 </intent-filter>
195 <intent-filter> 195 <intent-filter>
196 <action android:name="android.intent.action.SEARCH" /> 196 <action android:name="android.intent.action.SEARCH" />
197 </intent-filter> 197 </intent-filter>
198 <intent-filter> 198 <intent-filter>
199 <action android:name="com.sec.android.airview.HOVER" /> 199 <action android:name="com.sec.android.airview.HOVER" />
200 </intent-filter> 200 </intent-filter>
201 <meta-data android:name="android.app.searchable" 201 <meta-data android:name="android.app.searchable"
202 android:resource="@xml/searchable" /> 202 android:resource="@xml/searchable" />
203 </activity-alias> 203 </activity-alias>
204
205 <!-- Document mode Activities. -->
206 <activity android:name="org.chromium.chrome.browser.document.UpgradeActi vity"
Ted C 2016/03/25 17:38:05 I would use a more verbose name to ensure we don't
gone 2016/03/25 22:05:41 Meant for this to be a generic upgrade/migration c
207 android:excludeFromRecents="true"
208 android:theme="@style/MainTheme"
209 android:windowSoftInputMode="adjustResize"
210 android:taskAffinity=""
211 android:launchMode="singleInstance"
212 android:persistableMode="persistNever"
213 android:autoRemoveFromRecents="false"
214 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
215 android:hardwareAccelerated="false">
216 </activity>
204 <activity android:name="org.chromium.chrome.browser.document.DocumentAct ivity" 217 <activity android:name="org.chromium.chrome.browser.document.DocumentAct ivity"
205 android:exported="false" 218 android:exported="false"
206 android:theme="@style/MainTheme" 219 android:theme="@style/MainTheme"
207 android:windowSoftInputMode="adjustResize" 220 android:windowSoftInputMode="adjustResize"
208 android:taskAffinity="" 221 android:taskAffinity=""
209 android:persistableMode="persistAcrossReboots" 222 android:persistableMode="persistAcrossReboots"
210 android:autoRemoveFromRecents="false" 223 android:autoRemoveFromRecents="false"
211 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 224 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
212 android:hardwareAccelerated="false"> 225 android:hardwareAccelerated="false">
213 </activity> 226 </activity>
214 <activity-alias android:name="com.google.android.apps.chrome.document.Do cumentActivity" 227 <activity-alias android:name="com.google.android.apps.chrome.document.Do cumentActivity"
215 android:targetActivity="org.chromium.chrome.browser.document.Documen tActivity" 228 android:targetActivity="org.chromium.chrome.browser.document.Documen tActivity"
216 android:exported="false"/> 229 android:exported="false"/>
217 <activity android:name="org.chromium.chrome.browser.document.IncognitoDo cumentActivity" 230 <activity android:name="org.chromium.chrome.browser.document.IncognitoDo cumentActivity"
218 android:icon="@mipmap/incognito_app_icon" 231 android:icon="@mipmap/incognito_app_icon"
219 android:exported="false" 232 android:exported="false"
220 android:theme="@style/IncognitoTheme" 233 android:theme="@style/IncognitoTheme"
221 android:windowSoftInputMode="adjustResize" 234 android:windowSoftInputMode="adjustResize"
222 android:taskAffinity="" 235 android:taskAffinity=""
223 android:persistableMode="persistNever" 236 android:persistableMode="persistNever"
224 android:autoRemoveFromRecents="false" 237 android:autoRemoveFromRecents="false"
225 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 238 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
226 android:hardwareAccelerated="false"> 239 android:hardwareAccelerated="false">
227 </activity> 240 </activity>
228 <activity-alias android:name="com.google.android.apps.chrome.document.In cognitoDocumentActivity" 241 <activity-alias android:name="com.google.android.apps.chrome.document.In cognitoDocumentActivity"
229 android:targetActivity="org.chromium.chrome.browser.document.Incogni toDocumentActivity" 242 android:targetActivity="org.chromium.chrome.browser.document.Incogni toDocumentActivity"
230 android:exported="false"/> 243 android:exported="false"/>
244
245 <!-- Custom Tabs -->
231 <activity android:name="org.chromium.chrome.browser.customtabs.CustomTab Activity" 246 <activity android:name="org.chromium.chrome.browser.customtabs.CustomTab Activity"
232 android:theme="@style/MainTheme" 247 android:theme="@style/MainTheme"
233 android:exported="false" 248 android:exported="false"
234 android:windowSoftInputMode="adjustResize" 249 android:windowSoftInputMode="adjustResize"
235 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 250 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
236 android:hardwareAccelerated="false"> 251 android:hardwareAccelerated="false">
237 </activity> 252 </activity>
253
254 <!-- ChromeTabbedActivity related -->
238 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity " 255 <activity android:name="org.chromium.chrome.browser.ChromeTabbedActivity "
239 android:theme="@style/MainTheme" 256 android:theme="@style/MainTheme"
240 android:exported="false" 257 android:exported="false"
241 android:windowBackground="@drawable/window_background" 258 android:windowBackground="@drawable/window_background"
242 android:windowSoftInputMode="adjustResize" 259 android:windowSoftInputMode="adjustResize"
243 android:launchMode="singleTask" 260 android:launchMode="singleTask"
244 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize" 261 android:configChanges="orientation|keyboardHidden|keyboard|screenSi ze|mcc|mnc|screenLayout|smallestScreenSize"
245 android:hardwareAccelerated="false"> 262 android:hardwareAccelerated="false">
246 </activity> 263 </activity>
247 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity" 264 <activity android:name="org.chromium.chrome.browser.multiwindow.MultiIns tanceChromeTabbedActivity"
248 android:theme="@style/MainTheme" 265 android:theme="@style/MainTheme"
249 android:exported="false" 266 android:exported="false"
250 android:windowBackground="@drawable/window_background" 267 android:windowBackground="@drawable/window_background"
251 android:windowSoftInputMode="adjustResize" 268 android:windowSoftInputMode="adjustResize"
252 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize" 269 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"
253 android:hardwareAccelerated="false"> 270 android:hardwareAccelerated="false">
254 </activity> 271 </activity>
272
255 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity" 273 <activity android:name="org.chromium.chrome.browser.sync.ui.PassphraseAc tivity"
256 android:theme="@style/MainTheme" 274 android:theme="@style/MainTheme"
257 android:autoRemoveFromRecents="true"> 275 android:autoRemoveFromRecents="true">
258 </activity> 276 </activity>
259 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity" 277 <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunAct ivity"
260 android:theme="@style/DialogWhenLarge" 278 android:theme="@style/DialogWhenLarge"
261 android:label="@string/fre_label" 279 android:label="@string/fre_label"
262 android:launchMode="singleTop" 280 android:launchMode="singleTop"
263 android:windowSoftInputMode="stateHidden|adjustPan" 281 android:windowSoftInputMode="stateHidden|adjustPan"
264 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize"> 282 android:configChanges="orientation|keyboardHidden|keyboard|screenSiz e|mcc|mnc|screenLayout|smallestScreenSize">
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 choose the first MediaRouteController that can play it, so the orde r of the list can be important. 781 choose the first MediaRouteController that can play it, so the orde r of the list can be important.
764 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones. 782 The most specific MediaRouteControllers should be listed first, fol lowed by more generic ones.
765 The downstream manifest replaces this block, and hence replaces the list of media route 783 The downstream manifest replaces this block, and hence replaces the list of media route
766 controllers with its own list. --> 784 controllers with its own list. -->
767 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS" 785 <meta-data android:name="org.chromium.content.browser.REMOTE_MEDIA_PLAYE RS"
768 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/> 786 android:value="org.chromium.chrome.browser.media.remote.DefaultMedia RouteController"/>
769 787
770 {% endblock %} 788 {% endblock %}
771 </application> 789 </application>
772 </manifest> 790 </manifest>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698